Resolve Sync Conflicts

Compare competing Project or Crafting changes safely

A Project ending in [conflict] is a local copy preserved when changes conflicted. Crafting progress can show a separate choice dialog. Start by opening the affected Project in Dashboard.

Project Copies

  1. From Dashboard, open the original and the [conflict] copy separately. Compare their Pattern and any work you need to keep. Reopen the original from Dashboard if it was already open when another device synced.
  2. Keep both while you decide. If each contains useful edits, preserve what you need in separate Projects or export a JSON Backup before cleanup.
  3. Only after checking the result, delete an unwanted copy. Check the Crafting cloud menu too: a Project not yet in the cloud needs Sync Project and Crafting; later Free changes need Sync now. Wait for Up to date before switching devices.

Deleting the first copy you see can discard newer local work. A conflict copy is a safety measure, not a command to delete either Project.

Crafting Progress

If the cloud menu asks you to Resolve, inspect the progress on this device and in the cloud. Use cloud keeps the cloud's complete state; Use this device keeps the local complete state. Combine completed beads appears only when both states belong to the same Pattern and merges placed-bead marks.

Compare both revisions before choosing. Combine completed beads is available here because both revisions belong to this Pattern.

  1. Combine the placed-bead marks from both revisions.

After combining two different placed-bead edits, this example shows 4 / 1,945. Open the cloud menu separately to check Up to date.

  1. Check the combined placed-bead count.

Check the selected count and Up to date status before continuing on another device. To reduce future conflicts, finish syncing before switching devices and avoid editing the same Project in multiple tabs at once.

Back to Save & Sync.