Resolving Conflicts

 

 

Once you have set the cursor on a conflict area, you can solve it.

To solve a conflict, you can:

 You can perform compound operations.  For instance, you can copy a block of lines from one side to the result, and then edit it further. This will mark the conflict as solved.

 The popup menu commands are applied on all the conflicts contained in the text selection.

Select Undo  to undo the most recent edit command, or Redo  to reapply an undone command.

The Unresolve   command changes text that has been edited, back to its original state.  It is different from Undo.  Use Unresolve when you have resolved a conflict, and you want to restore the conflict as " to be solved". All changes related to this part of text are lost (if it was edit by hand, a message box asks you to confirm).  Unresolve is enabled in the toolbar and in the Merge menu only when the cursor is located on a solved conflict.

Solved conflicts

Once a conflict was solved, the red border becomes black.

See also