merge-branch
Merge Branch
Integrate branch intent, not just patches. Prefer Git's merge machinery as a draft, then edit, refactor, audit, validate, and report the deliberate result.
Use clear branch terms: the destination receives the work and <source> supplies
it. Establish both from the request and repository state before mutation; ask
only when ambiguity remains about which branch should receive which work.
Choose One Mode
- Dry plan: When the user asks to analyze or plan without changing repository state, read and follow modes/dry-plan.md. A plan-only request finishes with the plan and any unresolved decisions.
- Audit: When the user asks to review a completed or in-progress merge result, read and follow modes/audit.md. Do not start or redo a merge unless separately authorized.
- Integrate: When the user asks to perform a merge, transplant branch work, or resolve conflicts, read and follow modes/integrate.md through the authorized committed or uncommitted endpoint.
If the request combines assessment and integration, complete the read-only mode first, then perform the already authorized integration. Ask only for consequential decisions or authority still missing from the request and inspected evidence.
Shared Guardrail
Do not move, force-update, or delete the source branch automatically. Convergence means the source tip is reachable from destination HEAD; aligning branch refs requires explicit approval.