Ellié Computing Home Page
My Shopping Cart

Your shopping cart is empty

Display Cart

Call us at +1 586 62 ELLIE / +1 586 62 35543 Office Closed
sales@elliecomputing.com - Contact us

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 contextual menu or the fly by toolbar. They will be applied on conflicts contained (even partially) in the current selection.
In addition, Resolve all macro buttons are available in the Resolve macro toolbar.

See also