 |
An outbound change. This is a change that occurred
only in the local workspace. |
- Copy the local file to the host using the Copy changes
to host action.
- Replace the local file using the Override changes to
local action.
|
 |
An incoming change. This indicates a change
has occurred only on the host. |
- Copy the remote resource to the local project using the Copy
changes to local action.
- Replace the remote resource using the Override changes
on host action.
|
 |
Conflicting changes. This indicates that changes
have been made both to the remote version and the local copy. The
conflict needs to be resolved to continue. |
You can resolve the conflict by taking the following
actions:- Indicating that you have inspected the conflicts (usually using
the compare editor) and resolved any differences using the Mark
as Merged action.
- Replacing the local copy with remote contents using the Override
changes to local action.
- Replacing the remote copy with the local contents using the Override
changes on host action.
|
 |
An item that has been newly mapped and never
inspected before. |
This is considered a conflict and should be
resolved as a conflicted resource. |