{"version":"2.1.257","anchor":"cloud-file-sync-now-detects-and-syncs-files-with-unresolved","canonical_anchor":"cloud-file-sync-now-detects-and-syncs-files-with-unresolved","heading":"Cloud file sync now detects and syncs files with unresolved merge conflicts","tier":"notice","area":"Directory Sync","scope":null,"heads_up":null,"url":"https:\/\/changelogs.core-directive.com\/v\/2.1.257\/e\/cloud-file-sync-now-detects-and-syncs-files-with-unresolved","release_url":"https:\/\/changelogs.core-directive.com\/v\/2.1.257","markdown":"### Cloud file sync now detects and syncs files with unresolved merge conflicts\n\nFiles with unresolved merge conflicts now sync as-is with markers intact instead of blocking, and both sides are told.\n\nCloud file sync now detects files with unresolved merge conflicts by inspecting `snapshot.conflicted`. When such files exist, sync uploads them as-is with conflict markers intact instead of blocking, and notifies both the user and the cloud session.\n\n- Area: Directory Sync\n- Tier: You'll notice\n- Useful: 3\/5\n- Signal: 3\/5"}