Merge conflicted resources

Before you can safely commit your changes to the repository you must first resolve all conflicts. In the case of pseudo-conflicts they can be resolved in most cases with an Update operation which will merge the incoming modifications into your working copy resource. In the case of real conflicts, conflicts that persist after an update operation, it is necessary to resolve the conflict using the built-in compare view and editor or, in the case of properties conflict, the Properties view. Before you can commit you must mark as resolved the affected files. Both pseudo and real conflicts can be resolved without an update. You can:

  • open the file in the compare editor

  • analyze the changes

  • edit the changes

  • decide which incoming changes need to be copied locally

  • decide which outgoing changes must be overridden or modified

After saving your local file you have to use the Mark as merged action from the contextual menu before committing.