cyberneticlibrary

Reconcile multiple git branches into one worktree

standupskillsetup L381,174
thedotmack/claude-mem
What it does

Facilitate group sync across git branches

Best for

Convening multiple worktrees/PRs as agents in a shared markdown chat to reconcile overlapping work without committing changes prematurely.

Outputs
  • · Actionable guidance
  • · Structured feedback
  • · State capture or diagnosis
Preconditions

User has multiple active git branches or open PRs with overlapping changes; needs to decide merge order and resolution strategy

Failure modes

Agents post one-shot status instead of resolving conflicts through rounds; fails to write SUMMATION itself; commits changes inside the chat instead of just deciding

Trust signals
  • · Explicit discipline rules and enforcement gates
  • · Stage-specific rubrics with measurable criteria
  • · Referenced playbooks and template files
  • · Output format examples with clear format