{"id":"bridge-devices.what-happens-when-both-macs-change-the-same-file","url":"/faq/bridge-devices/what-happens-when-both-macs-change-the-same-file","category":{"id":"bridge-devices","title":"Bridge & your devices"},"subcategory":{"id":"collab-sync","title":"Collab Sync"},"question":"What happens in Collab Sync when both Macs change the same file?","alt_questions":["Collab Sync conflict","Which version wins in Collab Sync?","Files changed on both Macs","Restore the other version Collab Sync","Conflict copy in synced folder"],"short_answer":"The newer version wins and the other is kept beside it with “conflict” in its name, so nothing is lost. Review the “Files changed on both Macs” note and click Restore to keep the other version instead.","answer_markdown":"The newer version is kept, and the other is saved right beside it with “conflict” in its name — nothing is lost. You'll get a notification and a **Files changed on both Macs** note.\n\nOpen Collab Sync and **Review** the note to see each file; if you'd rather keep the other version, click **Restore** and it syncs back across.\n\nTimes are compared carefully, so a Mac with a wrong clock can't quietly win; if a clock looks wrong, Storage Studio tells you to check it.\n\n- [“In use by …”](/faq/bridge-devices/what-does-in-use-by-mean-in-collab-sync)","answer_html":"<p>The newer version is kept, and the other is saved right beside it with “conflict” in its name — nothing is lost. You&#39;ll get a notification and a <strong>Files changed on both Macs</strong> note.</p>\n<p>Open Collab Sync and <strong>Review</strong> the note to see each file; if you&#39;d rather keep the other version, click <strong>Restore</strong> and it syncs back across.</p>\n<p>Times are compared carefully, so a Mac with a wrong clock can&#39;t quietly win; if a clock looks wrong, Storage Studio tells you to check it.</p>\n<ul><li><a href=\"/faq/bridge-devices/what-does-in-use-by-mean-in-collab-sync\">“In use by …”</a></li></ul>","answer_text":"The newer version is kept, and the other is saved right beside it with “conflict” in its name — nothing is lost. You'll get a notification and a Files changed on both Macs note.\n\nOpen Collab Sync and Review the note to see each file; if you'd rather keep the other version, click Restore and it syncs back across.\n\nTimes are compared carefully, so a Mac with a wrong clock can't quietly win; if a clock looks wrong, Storage Studio tells you to check it.\n\n- “In use by …”","tags":["collab sync","conflicts"],"related":[{"id":"bridge-devices.what-does-in-use-by-mean-in-collab-sync","question":"What does “In use by …” mean in Collab Sync?","url":"/faq/bridge-devices/what-does-in-use-by-mean-in-collab-sync"},{"id":"bridge-devices.what-is-collab-sync","question":"What is Collab Sync?","url":"/faq/bridge-devices/what-is-collab-sync"}],"applies_to":"all","last_reviewed":"2026-10-01","title":"What happens in Collab Sync when both Macs change the same file? — Storage Studio FAQ","description":"The newer version wins and the other is kept beside it with “conflict” in its name, so nothing is lost. Review the “Files changed on both Macs” note and click Restore to keep the other version instead.","crumbs":[{"name":"Home","path":"/"},{"name":"FAQ","path":"/faq/"},{"name":"Bridge & your devices","path":"/faq/bridge-devices/"},{"name":"What happens in Collab Sync when both Macs change the same file?","path":"/faq/bridge-devices/what-happens-when-both-macs-change-the-same-file"}],"jsonld":{"@context":"https://schema.org","@type":"FAQPage","url":"https://storagestudio.us/faq/bridge-devices/what-happens-when-both-macs-change-the-same-file","inLanguage":"en","dateModified":"2026-10-01","mainEntity":[{"@type":"Question","name":"What happens in Collab Sync when both Macs change the same file?","alternateName":["Collab Sync conflict","Which version wins in Collab Sync?","Files changed on both Macs","Restore the other version Collab Sync","Conflict copy in synced folder"],"acceptedAnswer":{"@type":"Answer","text":"The newer version is kept, and the other is saved right beside it with “conflict” in its name — nothing is lost. You'll get a notification and a Files changed on both Macs note.\n\nOpen Collab Sync and Review the note to see each file; if you'd rather keep the other version, click Restore and it syncs back across.\n\nTimes are compared carefully, so a Mac with a wrong clock can't quietly win; if a clock looks wrong, Storage Studio tells you to check it.\n\n- “In use by …”","url":"https://storagestudio.us/faq/bridge-devices/what-happens-when-both-macs-change-the-same-file"}}]},"fragment":"<div class=\"wrap fl-wrap\"><div class=\"fl-layout\"><aside class=\"fl-side\" aria-label=\"FAQ topics\"><details open><summary>All topics</summary><ul class=\"fl-tree\"><li><a href=\"/faq/getting-started/\">Getting started</a> <span>70</span></li><li><a href=\"/faq/freeing-space/\">Freeing up space</a> <span>182</span></li><li><a href=\"/faq/moving-folders/\">Moving folders</a> <span>144</span></li><li><a href=\"/faq/apps/\">Apps</a> <span>146</span></li><li><a href=\"/faq/external-drives/\">External drives</a> <span>169</span></li><li><a href=\"/faq/finder-location/\">Finding things in Finder</a> <span>70</span></li><li><a href=\"/faq/cloud-accounts/\">Cloud accounts</a> <span>158</span></li><li><a href=\"/faq/icloud/\">iCloud &amp; iCloud Photos</a> <span>168</span></li><li><a href=\"/faq/data-transfers/\">Data Transfers</a> <span>119</span></li><li><a href=\"/faq/backups/\">Backups &amp; restore points</a> <span>126</span></li><li><a href=\"/faq/delta-drive/\">Delta Drive, Delta Trust &amp; My Drive</a> <span>125</span></li><li class=\"fl-open\"><a href=\"/faq/bridge-devices/\" aria-current=\"true\">Bridge &amp; your devices</a> <span>111</span><ul><li><a href=\"/faq/bridge-devices/#about-bridge\">About Bridge</a> <span>9</span></li><li><a href=\"/faq/bridge-devices/#pairing\">Pairing a device</a> <span>13</span></li><li><a href=\"/faq/bridge-devices/#connection\">Staying connected</a> <span>12</span></li><li><a href=\"/faq/bridge-devices/#managing-devices\">Managing paired devices</a> <span>11</span></li><li><a href=\"/faq/bridge-devices/#shared-folders\">Sharing folders</a> <span>9</span></li><li><a href=\"/faq/bridge-devices/#clipboard-sharing\">Clipboard sharing</a> <span>6</span></li><li><a href=\"/faq/bridge-devices/#bridge-app\">The Bridge app on your PC</a> <span>9</span></li><li><a href=\"/faq/bridge-devices/#activity\">Bridge Activity</a> <span>2</span></li><li class=\"fl-on\"><a href=\"/faq/bridge-devices/#collab-sync\">Collab Sync</a> <span>21</span></li><li><a href=\"/faq/bridge-devices/#privacy-security\">Privacy &amp; security</a> <span>8</span></li><li><a href=\"/faq/bridge-devices/#troubleshooting\">Troubleshooting</a> <span>11</span></li></ul></li><li><a href=\"/faq/duplicates/\">Duplicate files</a> <span>74</span></li><li><a href=\"/faq/junk-yard/\">Junk Yard</a> <span>113</span></li><li><a href=\"/faq/tuhi-assistant/\">Tuhi, your storage assistant</a> <span>105</span></li><li><a href=\"/faq/settings/\">Settings &amp; keep-time</a> <span>88</span></li><li><a href=\"/faq/performance-battery/\">Performance &amp; battery</a> <span>62</span></li><li><a href=\"/faq/privacy-safety/\">Privacy &amp; safety</a> <span>85</span></li><li><a href=\"/faq/licensing-payments/\">Licensing &amp; payments</a> <span>131</span></li><li><a href=\"/faq/troubleshooting/\">Troubleshooting &amp; messages</a> <span>180</span></li><li><a href=\"/faq/comparisons/\">Comparisons &amp; alternatives</a> <span>75</span></li><li><a href=\"/faq/mac-storage-basics/\">Mac storage basics</a> <span>315</span></li></ul></details></aside><div class=\"fl-main\"><nav class=\"fl-crumbs\" aria-label=\"Breadcrumb\"><ol><li><a href=\"/\">Home</a></li><li><a href=\"/faq/\">FAQ</a></li><li><a href=\"/faq/bridge-devices/\">Bridge &amp; your devices</a></li><li aria-current=\"page\">What happens in Collab Sync when both Macs change the same file?</li></ol></nav>\n<form class=\"fl-search\" action=\"/faq/search\" method=\"get\" role=\"search\" data-fl-search>\n<label class=\"fl-visually-hidden\" for=\"fl-q\">Search the FAQ</label>\n<input id=\"fl-q\" type=\"search\" name=\"q\" value=\"\" placeholder=\"Search 2,816 questions…\" autocomplete=\"off\" spellcheck=\"false\">\n<button type=\"submit\">Search</button>\n<div class=\"fl-suggest\" role=\"listbox\" hidden></div>\n</form>\n<article class=\"fl-entry\">\n<p class=\"eyebrow fl-eyebrow\"><a href=\"/faq/bridge-devices/\">Bridge &amp; your devices</a> · <a href=\"/faq/bridge-devices/#collab-sync\">Collab Sync</a></p>\n<h1>What happens in Collab Sync when both Macs change the same file?</h1>\n<p class=\"fl-short\"><strong>Short answer:</strong> The newer version wins and the other is kept beside it with “conflict” in its name, so nothing is lost. Review the “Files changed on both Macs” note and click Restore to keep the other version instead.</p>\n<div class=\"fl-answer\"><p>The newer version is kept, and the other is saved right beside it with “conflict” in its name — nothing is lost. You&#39;ll get a notification and a <strong>Files changed on both Macs</strong> note.</p>\n<p>Open Collab Sync and <strong>Review</strong> the note to see each file; if you&#39;d rather keep the other version, click <strong>Restore</strong> and it syncs back across.</p>\n<p>Times are compared carefully, so a Mac with a wrong clock can&#39;t quietly win; if a clock looks wrong, Storage Studio tells you to check it.</p>\n<ul><li><a href=\"/faq/bridge-devices/what-does-in-use-by-mean-in-collab-sync\">“In use by …”</a></li></ul></div>\n\n<p class=\"fl-meta\">Last reviewed <time datetime=\"2026-10-01\">October 1, 2026</time></p>\n\n<section class=\"fl-related\"><h2>Related questions</h2><ul><li><a href=\"/faq/bridge-devices/what-does-in-use-by-mean-in-collab-sync\">What does “In use by …” mean in Collab Sync?</a></li><li><a href=\"/faq/bridge-devices/what-is-collab-sync\">What is Collab Sync?</a></li></ul></section>\n<p class=\"fl-formats\">Also available as <a href=\"/faq/bridge-devices/what-happens-when-both-macs-change-the-same-file.md\">Markdown</a> and <a href=\"/faq/bridge-devices/what-happens-when-both-macs-change-the-same-file.json\">JSON</a>.</p>\n</article></div></div></div>"}