git-conflict-resolve

Resolve git conflicts by understanding intent on every side, not by picking a winner. Use when an integration step (merge, rebase, cherry-pick, revert, or — only on explicit request — stash apply) left files with <<<<<<< markers. Scope is conflict resolution only — does not commit, continue, drop, or otherwise advance the integration.