Skip to content
Soji

Resolve conflicts from syncing

Updated:

On this page
  1. Resolve a conflict
  2. When a collection or tag file has a conflict

If you change the same item on more than one Mac, the syncing service can create a second version. Crabwise lists items that have another version under Conflicts. Choose which version to keep to resolve the conflict.

An item in conflict can’t be edited until you resolve it. Crabwise keeps both versions as they are.

Resolve a conflict

  1. Click Conflicts in the sidebar. It appears only when there are conflicts.
  2. Click Resolve… in the notice above the list. The Resolve Conflict sheet opens. You can also select an item and choose Item > Resolve Conflict….
  3. Compare This Mac’s Version and Synced Version. You’ll see the modified dates and differences in name, notes, URL, collections, tags, rating, and so on.
  4. Choose one of these:
ButtonResult
Use This Mac’s VersionKeeps this Mac’s version.
Use Synced VersionKeeps the synced version.
Keep BothAdds the synced version’s content as a new item. The original item stays as this Mac’s version.
Decide LaterCloses the sheet. The item stays in conflict and keeps appearing under Conflicts.

Whichever you pick, the kind and file name stay as they are in This Mac’s Version.

If you turn on Move the conflicting copy to the Trash at the bottom of the sheet before choosing, the conflicting file goes to the Trash once the conflict is resolved. It is off at first.

If there are several synced versions, the screen shows which one you are looking at, for example Synced Version 1 of 2.

When Crabwise could merge an item automatically, it shows Already merged, and the conflicting copy’s file is left in place. A backup of this Mac’s version from before the merge is saved in the item’s folder.

When a collection or tag file has a conflict

When another version is found for a file that isn’t an item, no Resolve… button appears. Crabwise keeps using the current file. Compare the versions in the library folder and choose one to keep. To compare, open the file in an app that supports version history (such as CotEditor) and choose File > Revert To > Browse All Versions.

CrabwiseSupportPrivacy Policy