ctaxnagomi Resolving Merge Conflicts
Systematically resolve merge conflicts by understanding both sides and finding the correct resolution.
Process
- Read both sides — What does each branch change?
- Understand intent — Why was each change made?
- Find the correct resolution — Which changes should win?
- Apply the resolution — Make the code correct.
- Verify — Tests pass, behavior is correct.
Rules
- Understand both sides before resolving.
- The correct resolution preserves both intents when possible.
- Don't just pick one side blindly.
- Test after resolving.
Credit
This skill is based on the work of Matt Pocock (@mattpocock). Original source: mattpocock/skills. Licensed under MIT.
How to use?
1. Download
Go to the AGENT KD SKILL gallery and find this skill card. Click Download to save the SKILL.md file to your computer.
2. Install
Copy the downloaded SKILL.md into your agent's skills directory:
| Agent | Path |
|---|---|
| opencode | ~/.config/opencode/skills//SKILL.md |
| Claude Code | ~/.claude/skills//SKILL.md |
| Codex CLI | ~/.codex/skills//SKILL.md |
| Cursor | ~/.cursor/skills//SKILL.md |
| Gemini CLI | ~/.gemini/skills//SKILL.md |
Example for opencode:
ash mkdir -p ~/.config/opencode/skills/<skill-name> cp SKILL.md ~/.config/opencode/skills/<skill-name>/SKILL.md
3. Use
Restart your agent session. The skill will auto-load based on its description. You can also invoke it explicitly by typing @ in your agent.
4. Verify
Ask your agent something related to the skill's purpose. If it responds using the skill's instructions, you're all set.