Visual Conflict Editing
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.
| 
