Resolved and Remaining Differences

A difference is resolved if the changes to a line are accepted. A remaining difference is one that has not yet been resolved.

If the Auto Merge option is selected, Merging resolves differences automatically.