A new conflictsOnLaptop notifier tells Claude when files in the synced checkout hold the user's unresolved merge, rebase, cherry-pick, revert, or stash-pop conflict markers. The notice clears once the user resolves or aborts the operation.
Directory sync reports unresolved conflicts on the user's laptop
Claude is told when your synced checkout holds unresolved merge, rebase or stash conflict markers, and when they clear.
You'll noticeTier: how much it should matter to you
4Useful: my rating, 1 to 5
3Signal: worth watching, 1 to 5
Directory SyncArea: what it touches
New FeaturesKind: in v2.1.257,
What probably matters to youSection of the release