You'll notice
No documentation found
Claude is told when your synced checkout holds unresolved merge, rebase or stash conflict markers, and when they clear.
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.