conflict-resolution

github:troykelly/codex-skills · first seen 2026-10-31 · source · badge

Use when encountering merge conflicts - handle conflicts cleanly, verify resolution, and maintain code integrity

Skill Health: not yet scored

Listed, not yet scored. This skill has no public model test yet. It is in the scoring queue; submitted skills go first, then the most-installed.

Version history