{"version":"2.1.257","anchor":"directory-sync-reports-unresolved-conflicts-on-the-users-la","canonical_anchor":"directory-sync-reports-unresolved-conflicts-on-the-users-la","heading":"Directory sync reports unresolved conflicts on the user's laptop","tier":"notice","area":"Directory Sync","scope":null,"heads_up":null,"url":"https:\/\/changelogs.core-directive.com\/v\/2.1.257\/e\/directory-sync-reports-unresolved-conflicts-on-the-users-la","release_url":"https:\/\/changelogs.core-directive.com\/v\/2.1.257","markdown":"### Directory sync reports unresolved conflicts on the user's laptop\n\nClaude is told when your synced checkout holds unresolved merge, rebase or stash conflict markers, and when they clear.\n\nA 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.\n\n- Area: Directory Sync\n- Tier: You'll notice\n- Useful: 4\/5\n- Signal: 3\/5"}