Description of resolving conflicts 2 illustration

This figure shows the Merge Conflicts dialog. It consists of the following columns: Changed Object, Status, and Action.