Resolve Conflicts
How to Resolve Conflicts
Note: The Resolve Conflicts dialog box will be opened automatically during a check-in or merge or reconciling folder difference operation if there are any conflicts.
Here are the list of resolution options for different conflict types.
Resolve Options for Merge | Description |
Branch: Discard changes from source branch Delete target branch |
If a new item is added into source branch, and target branch does not have it, there will be a conflict which will be merged automatically by default. |
Delete: Discard changes from source branch Delete target branch |
If an item has been deleted from source branch, and the target branch has a copy, there will be a conflict when doing merge. |
Edit: Auto merge Merge in merge tools Discard changes from source branch Copy item from source branch |
If an item's contents have been updated in source branch, and the target branch has a copy, there will be a conflict when doing merge. Learn more>> |
Move: Take source branch Keep target branch |
If an item has been moved to a new directory in source branch, there will be a conflict when doing merge. |
Purge: Discard changes from source branch Purge target branch |
If an item has been purged from source branch, and the target branch copy has been deleted, there will be a conflict when doing merge. |
Recover: Discard changes from source branch Restore target branch |
If an item's version has been updated (e.g. renamed) in source branch, and the copy from target branch has been deleted, there will be a conflict when doing merge. |
Rename: Take source branch Keep target branch |
If an item has been renamed in source branch, and the target branch has a copy, there will be a conflict when doing merge. |
Followings are other possible combinations of different types of conflict.
Other Resolve Options for Merge | Description |
Delete, Purge | If an item has been purged from source branch, and the target branch has a copy, there will be a conflict when doing merge. |
Rename, Edit | If an item has been updated and renamed in source branch, there will be a conflict when being merged to target branch |
Move, Edit | If an item has been updated and moved to another directory in source branch, there will be a conflict when being merged to target branch. |
Move, Rename | If an item has been renamed and moved to another directory in source target, there will be a conflict when being merged to targed branch. |
Move, Rename, Edit | If an item has been updated, renamed and moved to another directory in source target, there will be a conflict when being merged to targed branch. |
Recover, Move | If an item has been moved to a new directory in source branch, and the copy in target branch has been deleted, there will be a conflict when doing merge. |
Recover, Rename | If an item has been renamed in source branch, and the copy in target branch has been deleted, there will be a conflict when doing merge. |
Recover, Move, Rename | If an item has been renamed and moved to a new directory in source branch, and the copy in target branch has been deleted, there will be a conflict when doing merge. |
Following cases are still unmergable at the moment.
For these unmergeable files, please find and delete them manually. Otherwise, they will be displayed again in next Merge.