mirrors/mattpocock-skills
2
0
Fork 1
mirror of https://github.com/mattpocock/skills.git synced 2026-06-25 08:24:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

refine: Add skill documentation for resolving merge conflicts

Browse source
This commit is contained in:
Matt Pocock 2026-06-02 21:07:31 +01:00
commit 81ddacb08b
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
skills/engineering/resolving-merge-conflicts/SKILL.md Normal file
View file

@ -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.