Resolving Conflicts

An update operation may bring the local copy of a file in a conflict state. The conflict state can be resolved more quickly if the conflicts are edited visually in a compare view which presents the two conflicting versions side by side like a Diff application. In the compare view the user decides for each conflict the variant which will remain and will be finally committed to the repository: the local one, the repository one or a manually edited combination of the two variants.

A merge operation also can create conflicts in a working copy. At the end of the merge operation all the conflicts can be resolved quickly in a dialog which lists all of them and allows selecting one of four possible resolutions for each conflict: Keep incoming, Keep outgoing, Mark resolved and Resolve later.