swarm: Command for Claude Code

/merge_session

Merge session branch(es) into main via rebase + fast-forward push. Use from inside a session worktree pane to land your work, or with --all to batch merge all sessions from the main repo.

Consolidates the former /merge_all_sessions command (now /merge_session --all).

Usage

/merge_session [--all] [--cleanup]

Examples:

• /merge_session (merge current session branch into main)
• /merge_session --all (batch merge all session branches)
• /merge_session --all --cleanup (merge all + remove worktrees + delete branches)

Argument parsing

Parse $ARGUMENTS to extract:

• --all: Merge ALL session/pane-* branches sequentially (run from main repo, not a worktree)
• --cleanup: After merging, remove worktrees and delete branches for successfully merged sessions

---

Default behavior (single session merge)

1) Verify branch

Run git branch --show-current. If it does not match session/*, print an error and stop:

Error: Not on a session branch (current: <branch>). /merge_session only works from session/* branches.

2) Check working tree

Run git status --porcelain. If there is any output, print an error and stop:

Error: Working tree is dirty. Commit or stash changes before merging.

List the dirty files so the user knows what to deal with.

3) Fetch latest main

git fetch origin main

4) Rebase onto main

git rebase origin/main

If the rebase fails with conflicts:

• Run git rebase --abort
• Run git diff --name-only --diff-filter=U to list conflicting files
• Print the list and stop:

  Rebase conflict — aborted. Conflicting files:
    <file1>
    <file2>
  Resolve manually or coordinate with the other session.
  

5) Push to main

git push origin HEAD:main

If the push is rejected (non-fast-forward):

• Fetch again: git fetch origin main
• Rebase again: git rebase origin/main (abort on conflict as above)
• Retry push once: git push origin HEAD:main
• If it fails again, report the error and stop.