














Resolve conflicts that may occur when you upload files after working offline.
Transcript
00:03
In Desktop Connect or you have the option to work offline.
00:08
This is useful, for example, when you need to work somewhere without online access, such as a job site.
00:15
Once you go back online to upload your changes,
00:18
conflicts can arise if other team members have made edits to the same files during this same time period.
00:24
In this case, Desktop Connector enables you to resolve these conflicts by selecting the changes to keep.
00:31
Looking at an example, suppose a user selects Work offline
00:35
and then makes changes to some relevant files.
00:39
After the user saves all changes, back in the local workspace,
00:43
notice that these same files have a pending sync status.
00:47
Also, the backup files are excluded, or blocked, meaning that they will not be uploaded to the cloud.
00:54
This behavior is based on the Work offline selection.
00:58
Later, to go back online and upload the offline work,
01:02
the user right-clicks Desktop Connector and deselects Work Offline.
01:07
In the tray, the gray icon indicates that Desktop Connector is reconnecting to the cloud,
01:12
but notice that a red dot appears to indicate a conflict.
01:16
Click Desktop Connector, and in the Autodesk Docs home screen,
01:20
you can see that a file conflict has prevented one of the files from uploading.
01:25
In this case, another team member edited the same file in the cloud while the user made changes offline.
01:32
To resolve the conflict, click Browse (…) next to the file name, and then select Resolve.
01:38
In the Conflict Resolution dialog, you see the options for resolution,
01:42
which include keeping only one or both sets of changes, or resolving the issue later.
01:48
At this point, you can coordinate with the other team member to determine how best to move forward.
01:54
In this case, Keep mine is selected, and Desktop Connector uploads the changes to the cloud.
02:01
Working offline allows you to edit project files away from online access,
02:05
and then upload the changes once you are back online.
02:09
If other users edit the same files during this time,
02:13
conflicts can easily be resolved by choosing which changes you want to keep.
00:03
In Desktop Connect or you have the option to work offline.
00:08
This is useful, for example, when you need to work somewhere without online access, such as a job site.
00:15
Once you go back online to upload your changes,
00:18
conflicts can arise if other team members have made edits to the same files during this same time period.
00:24
In this case, Desktop Connector enables you to resolve these conflicts by selecting the changes to keep.
00:31
Looking at an example, suppose a user selects Work offline
00:35
and then makes changes to some relevant files.
00:39
After the user saves all changes, back in the local workspace,
00:43
notice that these same files have a pending sync status.
00:47
Also, the backup files are excluded, or blocked, meaning that they will not be uploaded to the cloud.
00:54
This behavior is based on the Work offline selection.
00:58
Later, to go back online and upload the offline work,
01:02
the user right-clicks Desktop Connector and deselects Work Offline.
01:07
In the tray, the gray icon indicates that Desktop Connector is reconnecting to the cloud,
01:12
but notice that a red dot appears to indicate a conflict.
01:16
Click Desktop Connector, and in the Autodesk Docs home screen,
01:20
you can see that a file conflict has prevented one of the files from uploading.
01:25
In this case, another team member edited the same file in the cloud while the user made changes offline.
01:32
To resolve the conflict, click Browse (…) next to the file name, and then select Resolve.
01:38
In the Conflict Resolution dialog, you see the options for resolution,
01:42
which include keeping only one or both sets of changes, or resolving the issue later.
01:48
At this point, you can coordinate with the other team member to determine how best to move forward.
01:54
In this case, Keep mine is selected, and Desktop Connector uploads the changes to the cloud.
02:01
Working offline allows you to edit project files away from online access,
02:05
and then upload the changes once you are back online.
02:09
If other users edit the same files during this time,
02:13
conflicts can easily be resolved by choosing which changes you want to keep.