solve conflicts?

 

 

Ellié Computing Merge offers a number of tools to solve conflicts. Those tools are quite similar in File and Folder Comparisons.

  to navigate between conflicts.

   to solve the conflict by using the left, right or ancestor item.

  to solve the conflict by using data from both left and right items.
 These tools can be used only in File Comparisons.

    to solve conflicts in Folder Comparisons.

 to unresolve the conflict

You can also use commands available in the popup menu. They will be applied on conflicts contained (even partially) in the current selection.

See also

• Resolving conflicts in File Comparisons
• Resolving conflicts in Folder Comparisons
• save a comparison status to reopen it later