ID: 771

Asset Conflicts

Step-by-step guide to resolving conflicts in Zoom

When using Zoom, there are instances where you may run into an issue where you are not able to checkin your asset because there is a newer version of an asset on your computer. This state is called “Conflict”. This is when you have a working copy of an asset on your computer that you have modified, however there is a newer revision of that asset on the Zoom Server. Zoom now does not know whether the asset on your computer or the one on the Zoom Server is the latest revision of the asset.

If a resource has undergone dissimilar namespace changes on the repository and in the working copy, and if the modifications can coexist, they are auto-merged. For example, a renamed resource on the repository can coexist with a move modification of the same resource in the working copy. After auto-merge the resource will have a new name and will be in a new location, factoring in both the rename and the move operations executed on it. Similar namespace changes cannot be merged. For example, if a resource gets renamed both on the repository and in the working copy, no auto-merge will be attempted. Also if one of the modifications is a deletion action, auto-merge will not be attempted.

To avoid conflicts, it is best to use Locks  whenever checking out assets in Zoom. That way, there is no confusion of who currently has the rights to create a new revision of an asset.

There are several types of conflicts that could occur inside of Zoom.

Type Description
Content conflict or data conflict Whenever the contents of a text file are modified by both the repository and the working copy in such a way that both changes cannot coexist.
Namespace conflict Whenever a resource (a file or a folder) undergoes a namespace modification on both sides, there is a possibility of namespace conflict. Specifically, when there are similar namespace modifications on both sides, like renames on both ends or moves on both ends, there will be a conflict. Also if on any one side the resource is deleted and on the other end if there has been a content modification or a move / rename, then that will be a conflict too.
Dependency Conflict Sometimes a resource is not conflicted content-wise or namespace-wise directly; but it could still be conflicted indirectly. This occurs when a resource is renamed at one end but its parent folder is deleted on the other end. There are a few ways to resolve this conflict so the end user must choose from a set of alternatives supplied by Zoom.

You will likely encounter a conflict when you try to checkin an asset and you get an “up-to-date” failure. The first thing that you need to do is perform and Update on that asset. Zoom provides an easy-to-use conflict resolution system that will

  • Instruct you on what to do
  • Allows you to choose which revision to keep
  • Rechecks if the conflict has indeed been resolved

The following are the best practices for resolving conflicts when you have tried to checkin an asset and you have received an up-to-date error on a non-text based asset (Photoshop file, InDesign, Video, etc.).

Up-to-Date Error - Asset Browser
Up-to-Date Error – Asset Browser
In Asset Browser
  1. If the Up-to-date error dialog is still active, click OK.
  2. Select the asset.
  3. Right-click and select Update.
  4. You will be prompted to open the Conflict Resolver. Click OK.
  5. Select the asset that is conflicted in the list.
  6. Right-click and select Accept Theirs or Accept Mine.
    Accept Theirs will accept the revision on the Zoom Server as the latest revision and replace your revision.
    Accept Mine will create a new revision on the Zoom Server with your revision.

    Accept Theirs - Conflict Resolver
    Accept Theirs – Conflict Resolver
  7. Click OK.
  8. Checkin your asset.
In Mac OS X Finder
  1. Select the asset in Finder.
  2. Right-click and select Evolphin Zoom > Update.
  3. Click Resolve Conflicts button.
  4. Select the asset that is conflicted in the list.
  5. Right-click and select Accept Theirs or Accept Mine.
    Accept Theirs will accept the revision on the Zoom Server as the latest revision and replace your revision.
    Accept Mine will create a new revision on the Zoom Server with your revision.
  6. Click OK.
  7. Checkin your asset.
In Windows Explorer
  1. Select the asset in Finder.
  2. Right-click and select Evolphin Zoom > Update.
  3. Click Resolve Conflicts button.
  4. Select the asset that is conflicted in the list.
  5. Right-click and select Accept Theirs or Accept Mine.
    Accept Theirs will accept the revision on the Zoom Server as the latest revision and replace your revision.
    Accept Mine will create a new revision on the Zoom Server with your revision.
  6. Click OK.
  7. Checkin your asset.