ggprompts/my-plugins/merge

ISSUE_ID="ISSUE-ID"
TABZ_API="http://localhost:8129"
TOKEN=$(cat /tmp/tabz-auth-token)
 
# 1. Kill worker terminal first
AGENT_ID=$(curl -s "$TABZ_API/api/agents" | jq -r --arg id "$ISSUE_ID" \
  '.data[] | select(.name == $id) | .id')
[ -n "$AGENT_ID" ] && curl -s -X DELETE "$TABZ_API/api/agents/$AGENT_ID" \
  -H "X-Auth-Token: $TOKEN"
 
# 2. Ensure on main
git checkout main
git pull
 
# 3. Merge feature branch
git merge "feature/$ISSUE_ID" --no-edit
 
# 4. Remove worktree and branch
git worktree remove ".worktrees/$ISSUE_ID" --force
git branch -d "feature/$ISSUE_ID"
 
# 5. Sync and push
bd sync
git push

./plugins/conductor/scripts/finalize-issue.sh "$ISSUE_ID"

# Test merge without committing
git merge --no-commit --no-ff "feature/$ISSUE_ID"
git merge --abort

# Get conflict files
git diff --name-only --diff-filter=U
 
# Show conflict details
git diff --check

git merge --ff-only "feature/$ISSUE_ID"

git merge --no-ff "feature/$ISSUE_ID"

git merge --squash "feature/$ISSUE_ID"
git commit -m "feat: description (ISSUE-ID)"

# Remove worktree (--force ignores uncommitted changes)
git worktree remove ".worktrees/ISSUE-ID" --force
 
# List remaining worktrees
git worktree list
 
# Prune stale worktree references
git worktree prune

# Delete local branch (fails if not merged)
git branch -d "feature/ISSUE-ID"
 
# Force delete (use carefully)
git branch -D "feature/ISSUE-ID"
 
# Delete remote branch
git push origin --delete "feature/ISSUE-ID"

# Find all merged feature branches
git branch --merged main | grep "feature/"
 
# Delete all merged feature branches
git branch --merged main | grep "feature/" | xargs git branch -d
 
# Find orphaned worktrees
git worktree list | grep -v "$(pwd)$"