{"name":"conflictsOnLaptop","slug":"conflictsonlaptop","family":"setting","title":"Settings keys","noun":"settings key","description":"Claude is told when your synced checkout holds unresolved merge, rebase or stash conflict markers, and when they clear.","description_source":"entry","described_by":{"version":"2.1.257","anchor":"directory-sync-reports-unresolved-conflicts-on-the-users-la"},"presence":{"first_seen":null,"removed_in":null,"in_current_build":false,"newest_mined":"2.1.322","builds":0,"mined_builds":161,"first_cited":null},"aliases":[],"entries":[{"version":"2.1.257","anchor":"directory-sync-reports-unresolved-conflicts-on-the-users-la","heading":"Directory sync reports unresolved conflicts on the user's laptop","line":"Claude is told when your synced checkout holds unresolved merge, rebase or stash conflict markers, and when they clear.","released_at":"2026-09-01 17:15:33","reason":"found in this entry's text"}],"entries_total":1,"docs":[],"docs_total":0,"gates":[],"related":[],"url":"https:\/\/changelogs.core-directive.com\/reference\/setting\/conflictsonlaptop","family_url":"https:\/\/changelogs.core-directive.com\/reference\/setting.json"}