merge

Worktree Merge

You are executing the /hydra:merge command. Merge a worktree branch back into the current branch.

Arguments

• $ARGUMENTS is parsed as:
  • First word: Worktree name
  • Second word (optional): Strategy (merge/rebase)

Examples:

• /hydra:merge feature-a - Merge with default strategy
• /hydra:merge feature-a rebase - Rebase instead of merge

Process

1. Parse Arguments and Validate

WORKTREE_NAME=$(echo "$ARGUMENTS" | awk '{print $1}')
STRATEGY=$(echo "$ARGUMENTS" | awk '{print $2}')
STRATEGY=${STRATEGY:-merge}  # Default: merge

# Validate strategy
if [[ "$STRATEGY" != "merge" && "$STRATEGY" != "rebase" ]]; then
  echo "Unknown strategy: $STRATEGY (allowed: merge, rebase)"
  exit 1
fi

2. Check if Worktree Exists

git worktree list | grep -qE "$WORKTREE_NAME|hydra/$WORKTREE_NAME" || {
  echo "Worktree '$WORKTREE_NAME' not found"
  exit 1
}

3. Determine Branch Names

WORKTREE_BRANCH=$(git worktree list --porcelain | grep -A2 "$WORKTREE_NAME" | grep "branch " | sed 's/branch refs\/heads\///')
CURRENT_BRANCH=$(git branch --show-current)

echo "Merge: $WORKTREE_BRANCH -> $CURRENT_BRANCH"

4. Check for Uncommitted Changes

In current directory (blocks):

if [[ -n $(git status --porcelain) ]]; then
  echo "ERROR: Uncommitted changes in current directory"
  echo "Commit or stash your changes first."
  git status --short
  exit 1
fi

In worktree (warning):

WORKTREE_PATH=$(git worktree list | grep "$WORKTREE_NAME" | awk '{print $1}')
if [[ -n $(git -C "$WORKTREE_PATH" status --porcelain) ]]; then
  echo "WARNING: Uncommitted changes in worktree '$WORKTREE_NAME'"
  git -C "$WORKTREE_PATH" status --short
  # Ask whether to continue
fi

5. Show What Will Be Merged

echo "The following commits will be merged:"
git log --oneline "$CURRENT_BRANCH".."$WORKTREE_BRANCH"

echo ""
echo "Affected files:"
git diff --stat "$CURRENT_BRANCH"..."$WORKTREE_BRANCH"