sk Skill · troykelly
conflict-resolution
Use when encountering merge conflicts — handle conflicts cleanly, verify resolution, and maintain code integrity
Open on skills.sh ↗read 2026-09-15
- installs 8w
- 0
- 30-day movement
- starts with the next reading
- Related entries
- 2
- Connections
- 4
typescriptjsonmarkdownbashShell
- Host repository
- troykelly/claude-skills
- Allowed tools
- Bash, Read, Edit, mcp__git__*
- Host stars
- 11
- Host language
- Shell