| AbstractGitMergeConflict | |
| AbstractGitMergeConflictVisitor | |
| AbstractPathGitMergeConflict | |
| AddAddGitMergeConflict | |
| AddRenameGitMergeConflict | |
| ContentGitMergeConflict | |
| ConvergentRenameGitMergeConflict | |
| DeleteModifyGitMergeConflict | |
| DeleteRenameGitMergeConflict | |
| DirectoryFileGitMergeConflict | |
| DivergentRenameGitMergeConflict | A merge conflict where the same file has been renamed differently on each side of a merge. |
| FileDirectoryGitMergeConflict | |
| ModifyDeleteGitMergeConflict | |
| RenameAddGitMergeConflict | |
| RenameDeleteGitMergeConflict | |
| SubmoduleGitMergeConflict | A merge conflict where the same submodule has been updated to point to different commits. |
| UnknownGitMergeConflict |