To Accept Difference Resolutions Automatically


In most cases, Diff Merge begins a session by resolving all nonconflicting (also called automatic) differences and then presents the differences that remain to you. (A nonconflicting difference is a difference that appears in only one contributor.)

If you want to see nonconflicting differences before they are resolved, use one of these commands on the Tools menu to resolve them.

In either case, you must then resolve the remaining differences manually.

Related Topics