resolve-conflicts · git:20260829.3551d02 · 2026-08-29 · sha256 a24f52c5cd4f034e
resolve-conflicts git:20260829.3551d02A
Immutable. This exact content never changes and is served at /api/v1/blob/a24f52c5cd4f034e.
No tool to install first
claude plugin marketplace add https://markdownregistry.com/mp/a/art_qgzqcjm5jm4ykbua/a24f52c5cd4f034e6402de8550c88815354bba0d7149c06509c22a20c0a78a84.json
Then /plugin install resolve-conflicts@markdownregistry-qgzqcjm5jm4ykbua 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: resolve-conflicts description: "Resolves an in-progress git merge or rebase conflict by recovering each side's intent from commits, PRs, and issues. Use when a merge or rebase stops on conflicts, or when the tree contains conflict markers." --- > Source: [mattpocock/skills - engineering/resolving-merge-conflicts](https://github.com/mattpocock/skills/tree/main/skills/engineering/resolving-merge-conflicts) 1. **See the current state** of the merge or rebase. Check git history and the conflicting files. 2. **Find the primary sources** for each conflict. Understand why each change was made and what the original intent was. Read the commit messages, check the PRs, check the original issues or 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. Resolve by default; reach for `--abort` only when the user asks for it. 4. **Run the quality gate.** Use `/verify-done` to discover and run the project's checks. Fix anything the merge broke. 5. **Finish the merge or rebase.** Stage everything and commit. If rebasing, continue until all commits are rebased.