| AbstractGitMergeConflict |
| AbstractPathGitMergeConflict |
| AddAddGitMergeConflict |
| AddRenameGitMergeConflict |
| ContentGitMergeConflict |
| ConvergentDirectoryRenameGitMergeConflict
Indicates an implicit directory rename failed because multiple directories which each contained a subset of the
same files were renamed to the same target directory.
|
| ConvergentRenameGitMergeConflict
Describes a conflict where two different files are renamed to the same destination.
|
| DeleteModifyGitMergeConflict |
| DeleteRenameGitMergeConflict |
| DirectoryFileGitMergeConflict |
DivergentDirectoryRenameGitMergeConflict
Indicates a directory rename failed because a single directory was renamed to multiple target
directories and git merge could not decide where to move a file. |
| DivergentRenameGitMergeConflict
A merge conflict where the same file has been renamed differently on each side of a merge.
|
| FileDirectoryGitMergeConflict |
| GitMergeConflict |
| GitMergeConflictType |
| GitMergeConflictVisitor |
| ImplicitDirectoryRenameGitMergeConflict
Indicates an implicit directory rename failed because an existing directory or file prevented git merge
from moving one or more files to the renamed directory.
|
| MergedRenameGitMergeConflict
Describes a conflict where two different files are renamed to the same destination.
|
| ModifyDeleteGitMergeConflict |
| RenameAddGitMergeConflict |
| RenameDeleteGitMergeConflict |
| SubmoduleGitMergeConflict
A merge conflict where the same submodule has been updated to point to different commits.
|
| UnknownGitMergeConflict |