fix: make conflict keymaps opt-in #224

Merged

barrettruth merged 1 commit from fix/opt-in-conflict-keymaps into main

2026-04-30 18:49:50 +00:00

barrettruth commented

2026-04-30 18:39:34 +00:00

Problem

Issue #223 reports that conflict resolution mappings can show up in unwanted situations, including clobbering core motions like ct and diff-style navigation keys. The current conflict support installs default buffer-local mappings in normal worktree buffers and can leave those mappings behind after conflict markers are resolved.

Solution

Make conflict and merge keymaps opt-in by default, keep the <Plug> targets as the manual mapping surface, and clear any installed buffer-local mappings when conflict state ends or a buffer detaches. Update the docs to describe the opt-in policy and add specs that cover keymap installation, cleanup on detach/resolve, reinstallation when conflicts return, and merge-hint behavior without configured keymaps.

Closes #223.

## Problem Issue #223 reports that conflict resolution mappings can show up in unwanted situations, including clobbering core motions like `ct` and diff-style navigation keys. The current conflict support installs default buffer-local mappings in normal worktree buffers and can leave those mappings behind after conflict markers are resolved. ## Solution Make conflict and merge keymaps opt-in by default, keep the `<Plug>` targets as the manual mapping surface, and clear any installed buffer-local mappings when conflict state ends or a buffer detaches. Update the docs to describe the opt-in policy and add specs that cover keymap installation, cleanup on detach/resolve, reinstallation when conflicts return, and merge-hint behavior without configured keymaps. Closes #223.

🎉 1