You'll noticeTier: how much it should matter to you
2Useful: my rating, 1 to 5
2Signal: worth watching, 1 to 5
Directory SyncArea: what it touches
ImprovementsKind: in v2.1.280,
ImprovementsSection of the release
What
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.
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.
Why
Previously, 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.
