A conflict may either be resolved automatically by Desktop Sync or may require a you to do something.
User action needed
| SkyVault action | Desktop Sync action | Result | Resolution |
|---|---|---|---|
| Update | Update |  |
Select either the desktop version or the SkyVault version. If you select the desktop version, that version is uploaded in SkyVault. If you select the SkyVault version, that version is applied on the desktop. See Conflicts and Pending Syncs... for information on resolving the conflict. |
| Rename | Rename | |
Select either the desktop version rename or the SkyVault version rename. If you select the desktop renamed file, the SkyVault version rename is discarded. If you select the SkyVault renamed file, the desktop version rename is discarded. See Conflicts and Pending Syncs... for information on resolving the conflict. |
| Move | Move | |
Select either the desktop action or the SkyVault action. If you select the desktop move, the SkyVault move of the file is cancelled and the desktop move is replicated in SkyVault. If you select the SkyVault move, desktop move of the file is cancelled and the SkyVault move is replicated on your desktop. See Conflicts and Pending Syncs... for information on resolving the conflict. |
| Delete | Update | |
Select either the desktop update action or the SkyVault delete action. If you select the desktop action, the updated desktop file is restored in SkyVault. If you select the SkyVault delete action, the file on your desktop is deleted and the update is discarded. See Conflicts and Pending Syncs... for information on resolving the conflict. |
| Delete | Rename | |
Select either the desktop rename action or the SkyVault delete action. If you select the desktop action, the desktop renamed file is restored in SkyVault with the new name. If you select the SkyVault delete action, the file on your desktop is deleted and rename is discarded. See Conflicts and Pending Syncs... for information on resolving the conflict. |
| Delete | Move | |
Select either the desktop move action or the SkyVault delete action. If you select the desktop action, the file is recreated on your desktop at the new location. If you select the SkyVault delete action, the file is deleted from its new location on your desktop. See Conflicts and Pending Syncs... for information on resolving the conflict. |
indicates a conflict. No user action needed
| SkyVault action | Desktop Sync action | Result | Resolution |
|---|---|---|---|
| Update | Rename |  |
File is renamed and updated |
| Update | Move | |
File is moved and updated |
| Update | Delete/Move out of synced site | |
File not deleted as it was updated in SkyVault. Conflict is resolved by restoring the SkyVault version to your desktop. |
| Update | Delete parent | |
Parent file not deleted as it was updated in SkyVault. Conflict is resolved by restoring the SkyVault version of the parent file to your desktop. |
| Rename | Update | |
File is renamed and updated |
| Rename | Move | |
File is moved and updated |
| Rename | Delete/Move out of synced site | |
File not deleted as it was updated in SkyVault. Conflict is resolved by restoring SkyVault version to your desktop. |
| Rename | Delete parent | |
Parent file not deleted as it was updated in SkyVault. Conflict is resolved by restoring the SkyVault version of the parent file to your desktop. |
| Move | Update | |
File is moved and updated |
| Move | Rename | |
File is renamed and moved |
| Move | Delete/Move out of synced site | |
File not deleted as it was updated in SkyVault. Conflict is resolved by restoring the file in a new location on your desktop. |
| Move | Delete parent | |
Parent file not deleted as it was updated in SkyVault. Conflict is resolved by restoring the parent file in a new location on your desktop. |
| Move out of synced site | Update | |
File moved to a new location in SkyVault. On your desktop, the file is moved to C:\Users\<username>\Alfresco\orphaned as it can't be saved in SkyVault. |
| Move out of synced site | Rename | |
File moved to a new location in SkyVault. On your desktop, the file is moved to C:\Users\<username>\Alfresco\orphaned as it can't be saved in SkyVault. |
| Move out of synced site | Move | |
File moved to a new location in SkyVault. On your desktop, the file is moved to C:\Users\<username>\Alfresco\orphaned as it can't be saved in SkyVault. |
| Move out of synced site | Delete/Move out of synced site | |
File deleted |
| Move out of synced site | Delete parent | |
File deleted |
| Delete | Delete/Move out of synced site | |
File deleted |
| Delete | Delete parent | |
File deleted |
| Delete parent | Update | |
Parent folder is deleted in SkyVault. On your desktop, the file is moved to C:\Users\<username>\Alfresco\orphaned as it can't be saved in SkyVault. |
| Delete parent | Rename | |
Parent folder is deleted in SkyVault. On your desktop, the file is moved to C:\Users\<username>\Alfresco\orphaned as it can't be saved in SkyVault. |
| Delete parent | Move | |
Parent folder is deleted in SkyVault. On your desktop, the file is moved to C:\Users\<username>\Alfresco\orphaned as it can't be saved in SkyVault. |
| Delete parent | Delete/Move out of synced site | |
File deleted |
| Delete parent | Delete parent | |
File deleted |
indicates no conflict.