{"version":"2.1.280","anchor":"directoryfolder-sync-now-includes-unmerged-conflicted-fil","canonical_anchor":"directoryfolder-sync-now-includes-unmerged-conflicted-fil","heading":"Git sync and snapshotting now handle unmerged (conflicted) files","tier":"notice","area":"Directory Sync","url":"https:\/\/changelogs.core-directive.com\/v\/2.1.280\/e\/directoryfolder-sync-now-includes-unmerged-conflicted-fil","release_url":"https:\/\/changelogs.core-directive.com\/v\/2.1.280","markdown":"### Git sync and snapshotting now handle unmerged (conflicted) files\n\nDirectory sync and git snapshots now account for files left in a conflicted, unmerged state\n\n**What**\n\n- Directory\/folder sync's git-based file listing now separately queries `git ls-files --unmerged` and folds those paths into the set of tracked, changed files considered for syncing, alongside the existing modified\/deleted listing.\n\n- The internal git snapshot\/checkpoint function gains logic to detect unmerged (conflicted) index entries via `ls-files -u -z`, verify their committed blob\/tree entries, and reconstruct an index-info update, rather than failing outright, unless the caller explicitly refuses to handle unmerged state.\n\n**Why**\n\nPreviously, files left in an unresolved merge-conflict state could be silently skipped during sync or could cause snapshotting\/checkpointing to fail outright. This makes both processes aware of and able to handle that state.\n\n- Area: Directory Sync\n- Tier: You'll notice\n- Useful: 2\/5\n- Signal: 2\/5"}