Added on source and target; content differs
Added on source and rename destination on target
Deleted on source and edited on target
Deleted on source and renamed on target
Children of directory which has DirectoryFile or FileDirectory conflict
Path is a directory on source and a file on target
Edited on source and deleted on target
Edited on source and target; content differs
Path is a file on source and a directory on target
No conflict
Same file renamed on both source and target; destination paths differ
Different files renamed to same destination path on both source and target
Rename destination on source and new file on target
Renamed on source and deleted on target
Rename destination on both source and target; content differs
The type of a merge conflict.