Resolving Conflicts Between Local and Repository Files

Before you can deliver local changes to the Dimensions CM repository, you must resolve any conflicts between your versions of the files and the versions already in the repository. These conflicts can occur if other users have delivered new versions since you last updated your work area.

Complete the following steps to resolve conflicts.

1. You may not be aware of the conflicts until you have attempted to deliver local files to the repository. Attempt a delivery if you are not sure. Dimensions will warn you of conflicts if any are detected.

2. Update your work area with the latest files from the stream in Dimensions. When you do this, resolve any conflicts. For example, you may choose to merge conflicting local files with the versions that you are updating from the repository.

3. Once you have successfully updated your work area and resolved or merged conflicting files, the files in your working area are the new, conflict-free versions of the files. You should again attempt to deliver your local files to Dimensions. Doing so will upload the resolved versions of the files to Dimensions, and there will be no further conflicts.

IMPORTANT! In certain cases, when you choose to merge items, the merged files may appear as having been moved. If this occurs, reopen the solution from source control to correctly display the merged file locations.

Related Topics

Updating a Work Area from a Stream

Delivering Changes to a Stream