Agent Skills: conflict-resolution
Use when encountering merge conflicts - handle conflicts cleanly, verify resolution, and maintain code integrity
developmentID: troykelly/codex-skills/conflict-resolution
1
Install this agent skill to your local
Skill Files
Browse the full folder contents for conflict-resolution.
Loading file tree…
Select a file to preview its contents.