Skip to main content
Jeden Skill in Manus ausführen
mit einem Klick

marshail-delegate-to-knowledge-branch-merge

Sterne4
Forks0
Aktualisiert9. Juli 2026 um 15:59

Reconcile MARSHAIL knowledge files diverged on two branches. Delegate when the user asks to "merge knowledge files from two branches", "resolve a conflict in .marshail/knowledge/", "reconcile knowledge changes between feature branch and trunk", "3-way merge knowledge frontmatter and bodies", "handle overlapping repo_paths between branches", "two branches independently added domain notes — merge them". Use at merge time when both sides changed `.marshail/knowledge/`, when there's a git conflict in a knowledge file, or when both branches added content in overlapping areas without textual conflict. The subagent (curator in mode `branch-merge`) performs the merge per the autonomy mode — applying it and returning a short summary in `auto`, or returning a summary diff plus any items needing human resolution in `review`.

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.

SKILL.md
readonly