com.atlassian.bitbucket.scm.git.command.merge.conflict

Interface GitMergeConflictVisitor

All Known Implementing Classes:

AbstractGitMergeConflictVisitor

public interface GitMergeConflictVisitor

Method Summary

Modifier and Type	Method and Description
void	visit(AddAddGitMergeConflict conflict)
void	visit(AddRenameGitMergeConflict conflict)
void	visit(ContentGitMergeConflict conflict)
default void	visit(ConvergentDirectoryRenameGitMergeConflict conflict)
void	visit(ConvergentRenameGitMergeConflict conflict)
void	visit(DeleteModifyGitMergeConflict conflict)
void	visit(DeleteRenameGitMergeConflict conflict)
void	visit(DirectoryFileGitMergeConflict conflict)
default void	visit(DivergentDirectoryRenameGitMergeConflict conflict)
void	visit(DivergentRenameGitMergeConflict conflict)
void	visit(FileDirectoryGitMergeConflict conflict)
default void	visit(ImplicitDirectoryRenameGitMergeConflict conflict)
default void	visit(MergedRenameGitMergeConflict conflict)
void	visit(ModifyDeleteGitMergeConflict conflict)
void	visit(RenameAddGitMergeConflict conflict)
void	visit(RenameDeleteGitMergeConflict conflict)
void	visit(SubmoduleGitMergeConflict conflict)
void	visit(UnknownGitMergeConflict conflict)

Method Detail

visit

void visit(@Nonnull
           AddAddGitMergeConflict conflict)

visit

void visit(@Nonnull
           AddRenameGitMergeConflict conflict)

visit

void visit(@Nonnull
           ContentGitMergeConflict conflict)

visit

default void visit(@Nonnull
                   ConvergentDirectoryRenameGitMergeConflict conflict)

Parameters:

conflict - a directory rename conflict where multiple directories with files that have the same name are renamed to the same target directory

Since:

6.3

visit

void visit(@Nonnull
           ConvergentRenameGitMergeConflict conflict)

visit

void visit(@Nonnull
           DeleteModifyGitMergeConflict conflict)

visit

void visit(@Nonnull
           DeleteRenameGitMergeConflict conflict)

visit

void visit(@Nonnull
           DirectoryFileGitMergeConflict conflict)

visit

default void visit(@Nonnull
                   DivergentDirectoryRenameGitMergeConflict conflict)

Parameters:

conflict - a directory rename conflict where a file cannot be moved because a single source directory was renamed between multiple target directories so there's no single destination

Since:

6.3

visit

void visit(@Nonnull
           DivergentRenameGitMergeConflict conflict)

visit

void visit(@Nonnull
           FileDirectoryGitMergeConflict conflict)

visit

default void visit(@Nonnull
                   ImplicitDirectoryRenameGitMergeConflict conflict)

Parameters:

conflict - a directory rename conflict where an existing directory or file in the target directory prevented moving one or more files from the source directory

Since:

6.3

visit

default void visit(@Nonnull
                   MergedRenameGitMergeConflict conflict)

Parameters:

conflict - a rename/rename conflict which was merged in place

Since:

6.2

visit

void visit(@Nonnull
           ModifyDeleteGitMergeConflict conflict)

visit

void visit(@Nonnull
           RenameAddGitMergeConflict conflict)

visit

void visit(@Nonnull
           RenameDeleteGitMergeConflict conflict)

visit

void visit(@Nonnull
           SubmoduleGitMergeConflict conflict)

visit

void visit(@Nonnull
           UnknownGitMergeConflict conflict)