merge-up

name	merge-up
version	1.0.0
description	Use when the user is inside a parallel stream (worktree branch) and wants to merge that branch's committed work into the parent branch it was created from, then bring the stream back up to date with the parent. True merge (keeps individual commits); prompts before pushing the parent. Pairs with /parallel-work, which records the parent in git config (branch.<name>.exosuitParent), and with /merge-down (the inverse direction).
trigger	manual
depends-on	[]
references	[]
disable-model-invocation	true
user-invocable	true
allowed-tools	Read, Glob, Grep, Bash, AskUserQuestion
argument-hint

---

merge-up

Merge the current stream's branch into the parent it was created from, then fast-forward the current branch back up to the parent. Safe across worktrees: the parent is usually checked out in another worktree, so the merge runs there via git -C rather than checking the parent out here (git forbids that).

Step 1 — Identify branches

B="$(git rev-parse --abbrev-ref HEAD)"
echo "current branch: $B"

• If B is HEAD (detached), STOP — tell the user to check out a branch.
• Resolve the parent P:

  P="$(git config "branch.$B.exosuitParent" || true)"
  

  • If empty, fall back to stripping the last -<suffix> (e.g. sprint-3-a → sprint-3) and verify it exists with git show-ref --verify --quiet refs/heads/<cand>.
  • If still unresolved or ambiguous, ASK the user which branch is the parent.
• If P == B or P doesn't exist, STOP and report.

Step 2 — Pre-flight cleanliness (both worktrees)

git status --porcelain            # current worktree — must be empty

• If the current worktree is dirty, STOP: the skill merges committed work only. Tell the user to commit or stash first.
• Locate the parent's worktree dir:

  git worktree list --porcelain
  

  Find the entry whose branch is refs/heads/$P; call its path PDIR.
  • If P is not checked out in any worktree, STOP and tell the user to check it out in a worktree first (the merge needs a working tree to run in).
• Verify the parent worktree is clean: git -C "$PDIR" status --porcelain must be empty. If dirty, STOP and report which worktree/path needs attention.

Step 3 — Merge current branch into parent (true merge)