Undo / Redo Cut / Copy / Paste / Select All Resolve with left / ancestor or right: solves all the conflicts currently selected with left, ancestor or right side Resolve with left then right / right then left: solves by using both side in the wanted order. It can be used as a working-base if the merge is complex. Resolve with left and right in-line: solves by merging left, ancestor and right items at in-line level. When conflicts happen, surrounds them with markers. Resolve with left and right in-line: solves the conflicts currently selected at in-line level, mixing left, ancestor and right sides surrounded with markers (such as <<<, |||, >>> ) when a conflict happens Resolve in-ine (favour left/right): solves the conflicts currently selected at in-line level, favouring versions from the left or right side. When conflicts happen, take the text from favoured side. Resolve in-line with left then right / right then left: solves by using both side in the wanted order each time a conflict is found at in-line level inside the change. Unresolve: removes the resolution text from the merge panel for the selected conflicts Close: empties the panel |
![]() |
See also