merge-conflicts skills

3 tagged merge-conflicts, measured the same way as everything else here.

moire-parallel

01

jamescazzetta/moire

Skill Claude CodeCodex

Set up and run several coding agents in parallel on one repository, with moire watching for collisions between them. Use when asked to parallelise work across agents, split a task among agents, or run agents concurrently in git worktrees.

not rated 18 9d ago A 51 tokens original MIT

moire

02

jamescazzetta/moire

Skill Claude CodeCodex

Interpret and act on a moire finding. Use when moire check or moire verify reports a CONFLICT or BROKEN result against another agent's worktree, or when deciding how to respond to an overlap with concurrent in-flight work.

not rated 18 9d ago A 52 tokens original MIT