resolving-merge-conflicts · git:20260831.bf88be6 · 2026-08-31 · sha256 9d8114f8ef0b31f5
resolving-merge-conflicts git:20260831.bf88be6A
Immutable. This exact content never changes and is served at /api/v1/blob/9d8114f8ef0b31f5.
No tool to install first
claude plugin marketplace add https://markdownregistry.com/mp/a/art_6vhut6rgyypcffvx/9d8114f8ef0b31f535a265fc05c364bd8cf2e2895a830040e06c22acb11f54b0.json
Then /plugin install resolving-merge-conflicts@markdownregistry-6vhut6rgyypcffvx in Claude Code. It installs this exact version, the one graded A here, pinned to the commit it was graded at, and leaves it there.
--- name: resolving-merge-conflicts description: "Use when you need to resolve an in-progress git merge/rebase conflict." --- 1. **See the current state** of the merge/rebase. Check git history, and the conflicting files. 2. **Find the primary sources** for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets. 3. **Resolve each hunk.** Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do **not** invent new behaviour. Always resolve; never `--abort`. 4. Discover the project's **automated checks** and run them, typically typecheck, then tests, then format. Fix anything the merge broke. 5. **Finish the merge/rebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.