Run any Skill in Manus with one click

marshail-knowledge-branch-merge

Stars4

Forks0

UpdatedJune 22, 2026 at 20:52

Reconcile MARSHAIL knowledge files diverged on two branches. Fallback skill for environments without subagent support. Triggers on "merge knowledge files from two branches", "resolve a knowledge conflict", "3-way merge knowledge frontmatter and bodies", "reconcile feature branch knowledge with trunk". Runs mode `branch-merge` inline in the current session.

Installation

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.

Run Skill in Manus

Source

crestreach

crestreach/marshail

View GitHub Repository View Creator Repositories

Download

Run Skill in Manus

Related occupationsSOC

Based on SOC occupation classification

Computer Occupations, All OtherComputer and Mathematical Occupations·SOC 15-1299

SKILL.md

readonly

name	marshail-knowledge-branch-merge
description	Reconcile MARSHAIL knowledge files diverged on two branches. Fallback skill for environments without subagent support. Triggers on "merge knowledge files from two branches", "resolve a knowledge conflict", "3-way merge knowledge frontmatter and bodies", "reconcile feature branch knowledge with trunk". Runs mode `branch-merge` inline in the current session.

marshail-knowledge-branch-merge (fallback — no-subagent environments)

This skill performs the work that the marshail-knowledge-curator subagent does in mode branch-merge, but inline in the current session, for tools that don't support custom subagents.

Source of truth: marshail-knowledge-curator.md — section for mode branch-merge. Read it and follow its Inputs / Workflow / Outputs / Exit criteria / Handoff sections exactly. Do not duplicate that content here.

If subagents are available, prefer marshail-delegate-to-knowledge-branch-merge so the work runs in fresh context.

More from this repository

same repository

marshail-delegate-to-implement

crestreach/marshail

MARSHAIL Implement stage. Delegate when the user asks to "implement phase X", "work on packet Y", "code this packet", "execute the plan", "start the next implementation cycle", "do the work for the current target", "write the code + tests for this", "run a Dev-QA pass", "close this cycle". Also delegate after the Plan stage (plan approved) to drive each implementation cycle, and after a verifier failure or reviewer fixup loop to resume coding. The subagent picks the cycle target, confirms / deepens the plan, executes (code + tests + Dev-QA where possible), offers the human a chance to inspect and give feedback, and closes the cycle by updating plan status, changelog, and learning files.

2026-07-094

marshail-promote-assets

crestreach/marshail

Copies MARSHAIL durable assets — both built-in lifecycle assets under `.marshail/{skills,skills-fallback,agents,rules}/` and repo-specific extensions under `.marshail/extensions/{skills,agents,rules}/` — into the project's config-sync source tree (default `.agent-config/`, overridable via `sync.agent_config_dir`), so the next `agent-conf-sync` run fans them out to all tool layouts. Names are preserved as-is: built-ins keep their `marshail-` prefix, extensions keep their `mx-` prefix. Use when the user asks to "promote MARSHAIL skills/agents/rules", "promote MARSHAIL extensions", "copy from .marshail to .agent-config", "wire MARSHAIL assets into the sync source", or similar — and from `marshail-init` for first-time setup.

2026-07-094

marshail-delegate-to-analysis

crestreach/marshail

MARSHAIL Repo recon / analysis stage. Delegate when the user asks to "analyze the repo for this change", "do recon", "narrow the search surface", "find the likely files / services / contracts", "identify invariants and test seams", "produce repo-recon.md", "what touches X in this codebase?", "where does Y live?", "scope the code areas before planning". Also delegate when change-brief.md exists and the Analysis stage is in scope, or when a planner / implementer flags they don't know enough about an area. The subagent reads the brief and existing knowledge, walks likely paths, and returns a tight repo-recon.md plus a stale-knowledge list — keeping intermediate exploration out of the parent context.

2026-07-094

marshail-delegate-to-architecture

crestreach/marshail

MARSHAIL Architecture / design stage. Delegate when the user asks to "design the solution", "agree the implementation concept", "discuss the architecture", "propose components / modules / APIs / schemas", "produce architecture-notes.md", "draft an ADR for this", "what's the right shape for this?", "compare design tradeoffs", "high-level layout for this change". Also delegate when change-brief.md and repo-recon.md exist and the change is large enough that the solution shape isn't obvious yet. The subagent drives the design conversation, captures rationale, and (when significant) promotes durable decisions to ADRs.

2026-07-094

marshail-delegate-to-driver

crestreach/marshail

Run a whole MARSHAIL change end-to-end. Delegate when the user asks to "run MARSHAIL on this", "do a full MARSHAIL change for X", "orchestrate this change end-to-end", "drive this through MARSHAIL stages", "manage stage transitions for me", "resume this MARSHAIL change", "pick up where the change left off", "I want one orchestrator instead of juggling stages", or any high-level "do the whole thing under MARSHAIL" intent. Also delegate when starting a new change in a MARSHAIL repo (with `.marshail/` initialized) and the user wants per-stage approval gates managed automatically. The subagent agrees scope, detects current stage from on-disk artifacts, dispatches per-stage agents, and surfaces approval gates.

2026-07-094

marshail-delegate-to-help

crestreach/marshail

MARSHAIL on-demand help. Delegate when the user asks "how does MARSHAIL work?", "what does the X stage do?", "which skill / agent should I use next?", "what stage am I in?", "explain the knowledge layer", "how do I write a delivery plan?", "what goes in repo-recon.md?", "how does the config sync fit in?", "what's the difference between marshail-init and marshail-load?", "what's the marshail acronym?", "MARSHAIL?", or any procedural / conceptual question about the MARSHAIL process, the knowledge layer, the available skills / agents, or how MARSHAIL applies to the current change. Also delegate when the caller is unsure which skill / agent to use, or when another skill / agent encounters a MARSHAIL-meta question that would pollute its context. The subagent reads marshail.md and the repo's .marshail/ tree, returns a concise answer, and (when asked) hands off — read-only.

2026-07-094

name	marshail-knowledge-branch-merge
description	Reconcile MARSHAIL knowledge files diverged on two branches. Fallback skill for environments without subagent support. Triggers on "merge knowledge files from two branches", "resolve a knowledge conflict", "3-way merge knowledge frontmatter and bodies", "reconcile feature branch knowledge with trunk". Runs mode `branch-merge` inline in the current session.

marshail-knowledge-branch-merge (fallback — no-subagent environments)

This skill performs the work that the marshail-knowledge-curator subagent does in mode branch-merge, but inline in the current session, for tools that don't support custom subagents.

If subagents are available, prefer marshail-delegate-to-knowledge-branch-merge so the work runs in fresh context.