Conflict handling

CELUM Drive differentiates between multiple conflict types:

• Tracking conflict: This conflict occurs when an object that needs to be synced can't be detected. When it comes to asset synchronisation, a tracking conflict will occur if the local asset version is deleted and the "deletion of local assets settings" are set to "delete and create a tracking conflict". To resolve it, you can either delete the asset version from your online repository, or re-download it.

  To avoid tracking conflicts, you can change your deletion of local assets settings.

  
  
  

• Version conflict: This conflict occurs when an asset is simultaneously being changed locally and online. To resolve it, select between keeping the local or online asset version.
  
  

  A version conflict won't be resolved if, during resolving the conflict, the online asset version or the scope, repository, or whole CELUM location directory are deleted or unsubscribed. Instead, the version conflict will turn into a tracking conflict.

  An example is the local modification tracking conflict: This conflict occurs after a version conflict occurred, but doesn't get resolved because the online asset version got deleted. To resolve it, either delete the local asset version, or upload the asset anew.  
  

• Renaming conflict: This conflict occurs when an asset is simultaneously being renamed locally and online. To resolve it, select between keeping the local or online name.
  

In the "Conflicts" tab, you can easily filter your conflicted assets via the Filter button. The selected filter criteria is represented by filter chips. You can remove a single chip from the filter criteria or remove all criteria by clicking on the "Clear all" action next to the filter chips or in the "Filter" menu.

With the filtering capability, you can: Filter by asset name: Type the conflicted asset name in the search field in the filter menu. Filter by scope: Select the scopes with the conflicted assets in the "Scopes" section" in the filter menu. You can also filter by a single scope by clicking on the "Solve conflict" icon next to a scope in the "Sync" tab. Filter by both scope and asset name. In this case, the results will show conflicted assets matching the scope AND asset name.