Resolve merge conflicts

After the merge operation is finished it is possible to have some resources in conflict. This means that some incoming modifications for a resource could not be merged with the current modifications from the working copy. If there are such conflicts, a dialog will appear presenting you the resources that are in conflict and from where you can choose a way in which every conflict should be resolved.

 

Figure 17.24. Merge conflicts dialog

Merge conflicts dialog

The options to resolve a conflict are: