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.
About this task
You can resolve a structural conflict by working with
the incoming change set that includes the conflicts.
- 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.)
- Move your mouse pointer over the name a conflicting file
to see a tool tip that identifies the type of conflict and suggests
ways to resolve it.
- Right-click the conflicting file and choose a way to resolve
the conflict.
- To try 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 apply all of the conflicting structural changes to your
workspace, click Resolve with proposed.
- 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 remove the conflicting structural changes from the change
set, click Resolve with mine.
Results
You are prompted to confirm your choice. After you do,
the merge is completed, and the outgoing change set can be delivered.