almerge

$npx mdskill add paleo/alignfirst/almerge

Resolves merge or rebase conflicts by investigating both sides.

  • Solves merge or rebase conflicts during version control operations.
  • Depends on the alignfirst skill and its merge protocol.
  • Investigates both sides of conflicts, with special handling for lock files.
  • Writes a brief summary of the resolution process.

SKILL.md

.github/skills/almergeView on GitHub ↗
---
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.

More from paleo/alignfirst

SkillDescription
alAlign-and-Do Protocol (AAD). Use for smaller tasks that don't need formal specs or plans.
aldescriptionWrite a description summarizing implemented work. Generates PR/MR descriptions from completed changes.
alignfirstCollaborative 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).
alignfirst-setup-guide>-
alplanCreate implementation plan(s) from a technical specification.
alreadRead all specs and summaries in the current task directory to prepare context.
alreviewWrite a code review report comparing the current branch to a base branch.
alspecCreate a technical specification (spec) for a feature or task.
openclaw-coder-playbookOperating-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.
sharp-writingConventions 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.