almerge

name	almerge
description	Resolve merge or rebase conflicts. Investigates both sides, resolves the conflicts (with a special case for lock files), and writes a brief summary.
disable-model-invocation	true

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.