Almerge

Resolve merge or rebase conflicts. Investigates both sides, resolves the conflicts (with a special case for lock files), and writes a brief summary.From its SKILL.md

Install

npx -y skills add paleo/alignfirst --skill almerge

Assembled from the repository path, not quoted from the project. Check it against their README if it does not work.

SKILL.md

0.4 KB, 54 tokens by cl100k_base, as published. Nobody here has run it

Read the alignfirst skill (../alignfirst/SKILL.md) and its references/merge-protocol.md if not already loaded.

Execute the merge protocol from the alignfirst skill. Do not use your own plan mode.

What ships with it

Read from the repository

Just SKILL.md. No reference files, no scripts.

Keep looking

Skills are one crate of 325,949. Ordering is by how many stacks a row turns up in, so the top of any crate is what has actually been picked rather than what has the most stars.