What is conflict-resolution?
Use when encountering merge conflicts - handle conflicts cleanly, verify resolution, and maintain code integrity Source: troykelly/codex-skills.
·conflict-resolution
</>
conflict-resolution
✓Use when encountering merge conflicts - handle conflicts cleanly, verify resolution, and maintain code integrity
Installation
How to Install conflict-resolution
Quickly install conflict-resolution AI skill to your development environment via command line
- Open Terminal: Open your terminal or command line tool (Terminal, iTerm, Windows Terminal, etc.)
- Run Installation Command: Copy and run this command: npx skills add https://github.com/troykelly/codex-skills --skill conflict-resolution
- Verify Installation: Once installed, the skill will be automatically configured in your AI coding environment and ready to use in Claude Code, Cursor, or OpenClaw
Source: troykelly/codex-skills.
SKILL.md
View rawCore principle: Conflicts require careful resolution, not just picking one side.
Announce at start: "I'm using conflict-resolution to handle these merge conflicts."
| Rebasing on updated main | git rebase origin/main | | Merging main into branch | git merge origin/main | | Cherry-picking commits | git cherry-pick [sha] | | Pulling with local changes | git pull |
Use when encountering merge conflicts - handle conflicts cleanly, verify resolution, and maintain code integrity Source: troykelly/codex-skills.
Facts (cite-ready)
Stable fields and commands for AI/search citations.
- Install command
npx skills add https://github.com/troykelly/codex-skills --skill conflict-resolution- Source
- troykelly/codex-skills
- Category
- </>Dev Tools
- Verified
- ✓
- First Seen
- 2026-02-25
- Updated
- 2026-03-10
Quick answers
How do I install conflict-resolution?
Open your terminal or command line tool (Terminal, iTerm, Windows Terminal, etc.) Copy and run this command: npx skills add https://github.com/troykelly/codex-skills --skill conflict-resolution Once installed, the skill will be automatically configured in your AI coding environment and ready to use in Claude Code, Cursor, or OpenClaw
Where is the source repository?
https://github.com/troykelly/codex-skills
Details
- Category
- </>Dev Tools
- Source
- skills.sh
- First Seen
- 2026-02-25