From 81ddacb08b3878d07ac4fa2de60bd8a53bacba5b Mon Sep 17 00:00:00 2001 From: Matt Pocock Date: Tue, 2 Jun 2026 21:07:31 +0100 Subject: [PATCH] refine: Add skill documentation for resolving merge conflicts --- .../engineering/resolving-merge-conflicts/SKILL.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 skills/engineering/resolving-merge-conflicts/SKILL.md diff --git a/skills/engineering/resolving-merge-conflicts/SKILL.md b/skills/engineering/resolving-merge-conflicts/SKILL.md new file mode 100644 index 0000000..aadb3fc --- /dev/null +++ b/skills/engineering/resolving-merge-conflicts/SKILL.md @@ -0,0 +1,14 @@ +--- +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.