Previous Topic: ConflictsNext Topic: Conflict Resolution Options


Conflict Scenarios

The table below lists changes in the source and local environments that lead to a conflict. In addition, the table lists the resolutions available for each.

Source Change Type

Local Change Type

Sync Conflict

Resolution
(name conflict = no)

Resolution
(name conflict = yes)

Update

Update

Yes

Overwrite
skip

Rename & Overwrite
Skip

Update

Delete

Yes

Recreate

Rename & Recreate Link & Overwrite

Update

None

No

N/A

Rename & Update
Skip

Add

None

No

N/A

Rename & Create Link
& Overwrite

None

Update

Yes

Overwrite
skip

Rename & Overwrite

None

Delete

Yes

Recreate

Rename & Recreate & Overwrite

None

None

No

N/A

N/A