Resolving structural conflicts

Structural conflicts occur when incoming and outgoing change sets include changes to the same directory namespace, usually the result of moving, removing, or renaming files or folders in a directory. Conflicts can be automatically or manually resolved without loading content into the sandbox. This ability simplifies the conflict resolution workflow for cases where result verification is performed through automated builds.

1. In the Pending Changes view, navigate to the Unresolved folder of the component in which the conflict exists.
   This folder and the conflicting files it contains are overlaid with the icon. (Nonconflicting files have already been added to your workspace.)
2. Move your mouse pointer over the name a conflicting file to see hover help that identifies the type of conflict and suggests ways to resolve it.
3. Optional: Configure a preference so that an attempt is made to automatically resolve conflicts on an accept or resume operation:
   1. From the main menu bar, click Window > Preferences.
   2. Expand the Team entry, expand Jazz Source Control, and click Changes.
   3. On the Changes page, select Automatically attempt to auto-resolve conflicts on accept and resume and click OK.
   Note: You can inspect the merge results after the accept action completes. Any merges that are not wanted can be undone.
4. Right-click the conflicting file and choose a way to resolve the conflict.
   • To resolve the conflict by automatically merging the content of the incoming change set with the content of your workspace, right-click the change set and click Auto Resolve. The Auto Resolve tool works by merging nonconflicting changes, which can be ambiguous in the case of structural conflicts. If it cannot complete the merge, it displays a message telling you that you must resolve the conflicts manually.
   • To keep the incoming structural changes, click Resolve with proposed.
     Note: This action discards your changes to the conflicted item.
   • To apply a subset of the conflicting structural changes to your workspace, click Move to open the Move Conflicted Items window. In the Move Conflicted Items window, you can select individual conflicted items and decide whether to move them to the location where they exist in the incoming change set or rename them so that they no longer conflict.
   • To discard the incoming changes and keep your side of the conflict, click Resolve with mine.
   • To undo the merge and have the file revert to the state before the merge was performed (preserving the changes and recreating the conflict), right-click the merged change; then, click Undo Merge.