Menu
Resolve merge or rebase conflicts. Investigates both sides, resolves the conflicts (with a special case for lock files), and writes a brief summary.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
| 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.
Operating-instructions dispatcher for the openclaw-coder autonomous-programmer workspace. Routes every user message by surface — thread → working session, channel/DM → channel handling — and carries the global rules. The workspace AGENTS.md loads this skill first on every user message.
Setup-time companion to install or upgrade any subset of {docmap, workspace, alignfirst skills} in a consumer repo. Use when asked to install, set up, or upgrade docmap, the workspace worktree system, or the AlignFirst skills.
Conventions for writing sharp, concise prose and Markdown, for human readers and AI agents. Read before writing documentation, READMEs, instructions, agent skills, or any prose text.
TypeScript and JavaScript coding style conventions, centered on top-down narrative ordering (caller first, helpers below) and functions over classes. Read before writing or reviewing TypeScript/JavaScript code, including code inside a spec or a plan.
Collaborative problem-solving protocols. Write technical specifications (spec, or alspec), create implementation plans (plan, or alplan), or use Align-and-Do Protocol (AAD). Also generates PR/MR descriptions (aldescription) and code review reports (alreview).
Align-and-Do Protocol (AAD). Use for smaller tasks that don't need formal specs or plans.
