一键在 Manus 中运行任何 Skill

almerge

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

在 Manus 中运行

概览

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

安装命令

npx skills add https://github.com/paleo/alignfirst --skill almerge

复制此命令并粘贴到 Claude Code 中以安装该技能

来源

paleo/alignfirst

星标81

分支7

更新时间2026年5月8日 15:32

SKILL.md

readonly

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.

同仓库更多 Skills

同仓库

openclaw-coder-playbook

paleo/alignfirst

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.

2026-06-0381

alignfirst-coaching

paleo/alignfirst

Coach an AlignFirst spec-plan-execute or AAD workflow using a CLI wrapper around a coding-agent CLI. Use when orchestrating coding agents through AlignFirst protocols non-interactively.

2026-05-3181

workspace-guide

paleo/alignfirst

Blueprint for implementing a workspace system — multiple git-worktree dev environments side by side — in a repository.

2026-05-3081

docmap

paleo/alignfirst

Conventions for writing, organizing, and browsing documentation in a docs/ directory using docmap. Use when creating documents, restructuring documentation, or unsure about frontmatter format and file naming conventions.

2026-05-2781

alignfirst

paleo/alignfirst

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).

2026-05-2681

paleo/alignfirst

Align-and-Do Protocol (AAD). Use for smaller tasks that don't need formal specs or plans.

2026-05-0581

来源

paleo

paleo/alignfirst

打开 GitHub 仓库查看创作者相关仓库

安装命令

下载

在 Manus 中运行

适用职业SOC

软件开发工程师计算机与数学类职业15-1252L4

一键运行任何 Skill