Conflicts and reconciliation

How SoundBase merges edits made in two places at once — automatically in current versions, and via the “Project Data Sync” dialog in older ones.

Current versions: conflicts resolve automatically

In current versions of SoundBase Desktop, you will not see a conflict dialog. When the same item was edited both on your computer and in the cloud, the app merges the two copies field by field:

• If you and a collaborator edited different fields of the same item, both edits survive.
• If you edited the same field, the most recent edit wins, silently.
• Items created or genuinely edited on your computer are never deleted by a cloud cleanup — real local work is preserved.

Warning

If two computers edit the same field of the same item while offline, the older edit is discarded on reconnect — with no prompt. Avoid editing one project on two offline computers at once. See the FAQ.

Older versions: the “Project Data Sync” dialog

Earlier versions of SoundBase Desktop handled conflicts differently, asking you to choose a side. If your version shows these screens, here is exactly what they do.

When a conflict is detected, a yellow warning-triangle button appears in the navigation bar with the tooltip “Project data on your device and in SoundBase Cloud are different. Click for more info.” Clicking it opens a dialog titled “Project Data Sync” listing each conflicted project (account-level conflicts appear as “User Data”) with a “Show” button.

The per-project dialog states: “There are differences between your local project data and the data stored in SoundBase Cloud. Please choose which version you want to keep.” and offers two choices:

• “Push Device Data to Cloud” — your computer’s copy wins. The conflicted items in the cloud are overwritten with your local versions.
• “Overwrite Cloud Data to Device” — the cloud copy wins. The conflicted items on your computer are overwritten with the cloud versions; unpushed local edits to those items are lost.

Either way, you must type the word overwrite into the confirmation field (“Type “overwrite” to confirm action“) before the action runs.

Warning

Both choices permanently discard the losing side’s edits for the conflicted items. Only the items actually in conflict are affected; everything else merges normally. Use “Copy Log to Clipboard” or “View Log” to inspect the differences (and share them with support) before deciding.

The dialog also includes “Pause Sync” / “Resume Sync”. While paused, the sync indicator reads “All changes are not saved to Cloud until sync is resumed” — nothing uploads until you resume.

Older versions also offered “PULL from Cloud” and “PUSH to Cloud” buttons under “Found a sync problem?”, each with an explicit confirmation ending in “IT CANNOT BE UNDONE.” — these replace an entire project copy in one direction and should be used only when you’re certain which copy is correct.