Skill
Git Conflict Resolution
Resolves merge and rebase conflicts by working out what each side intended, combining them on purpose and proving the result with tests.
1A conflict is two intentions colliding. Find both before you edit a line.
2Steps
31. Run `git status` and list the conflicted files. Note whether this is a merge, rebase or cherry-pick: during a rebase, "ours" is the branch being rebased onto and "theirs" is your own commit, which is the reverse of what people expect.
42. For each file, read the intent of both sides: `git log --merge -p -- <file>` shows the commits from each side that touch it. Read their messages and diffs. Read the whole file around the markers, not just the marked block.
53. Choose one of three outcomes and be able to say why: keep one side, keep both combined, or write something new that satisfies both. Never keep both blocks pasted together without checking they still make sense.
Claude CodeCodex
Git Conflict Resolution
SkillGit and releases
Free