almerge

Sterne83

Forks7

Aktualisiert8. Mai 2026 um 15:32

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

Installation

Mit Codex oder Claude installieren Kopieren Sie diesen Prompt, fügen Sie ihn in Codex, Claude oder einen anderen Assistant ein und lassen Sie die Skill-Seite prüfen und installieren.

In Manus ausführen

Quelle

paleo

paleo/alignfirst

GitHub-Repository öffnen Creator-Repositorys ansehen

Download

In Manus ausführen

Verwandte BerufeSOC

Basierend auf der SOC-Berufsklassifikation

SoftwareentwicklerInformatik- und Mathematikberufe·SOC 15-1252

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.

Mehr aus diesem Repository

gleiches Repository

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-07-1883

alignfirst-setup-guide

paleo/alignfirst

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.

2026-07-1783

sharp-writing

paleo/alignfirst

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.

2026-07-1583

top-down-typescript

paleo/alignfirst

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.

2026-07-1583

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-07-1183

paleo/alignfirst

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

2026-05-0583

Jeden Skill mit einem Klick ausführen