Resolving Conflicts

If any of the files you changed in your child workspace were also changed in the parent workspace, they are in conflict. If Configuring discovers any conflicts during the Bringover Update transaction, it automatically activates a popup window advising you of this.

To resolve conflicts:

1. Initiate the Resolve transaction by clicking Resolve now in the popup window to open the Resolve version of the Transactions window.

   Configuring automatically alters the workspace icon to alert you that a workspace contains unresolved conflicts. It also:

   • Lists the path names of the files that are in conflict in the Resolve Transaction window

   • Starts the Merging program, loading the first file in the list

     Merging displays two text files (the versions of the file from the parent and child workspaces) for side-by-side comparison, each in a read-only subwindow. Each version is shown in comparison (using glyphs) to the version that existed before the changes were made. Beneath them, Merging displays a subwindow that contains a merged version. The merged version contains selected lines from either or both deltas.

2. Merging automatically merges the files for you in the bottom window.

   You can override the choices made by the program by using the Left and Right buttons to accept the changes found in the left or right window.

   ---

   Note -

   If at any point during resolution, you want to reload the files, abandoning all the conflicts that have been resolved and starting over, click the Reload button. The files are reloaded from disk, and any non-conflicting differences are resolved if the Auto Merge option is selected. You can then proceed with accepting one or the other version of the remaining conflicting lines.

   ---

3. When you are satisfied with the merged file, click Save to save the file.

   If there are more files in the Transactions window conflict list, Configuring automatically loads the next file in the list into Merging.

   For more information about resolving conflicts and merging files, see Chapter 9, Resolving Conflicts."