zouyangxiaohao111/javaclawbot/finishing-a-development-branch

# Run project's test suite
npm test / cargo test / pytest / go test ./...

Tests failing (<N> failures). Must fix before completing:
 
[Show failures]
 
Cannot proceed with merge/PR until tests pass.

# Try common base branches
git merge-base HEAD main 2>/dev/null || git merge-base HEAD master 2>/dev/null

Implementation complete. What would you like to do?
 
1. Merge back to <base-branch> locally
2. Push and create a Pull Request
3. Keep the branch as-is (I'll handle it later)
4. Discard this work
 
Which option?

# Switch to base branch
git checkout <base-branch>
 
# Pull latest
git pull
 
# Merge feature branch
git merge <feature-branch>
 
# Verify tests on merged result
<test command>
 
# If tests pass
git branch -d <feature-branch>

# Push branch
git push -u origin <feature-branch>
 
# Create PR
gh pr create --title "<title>" --body "$(cat <<'EOF'
## Summary
<2-3 bullets of what changed>
 
## Test Plan
- [ ] <verification steps>
EOF
)"

This will permanently delete:
- Branch <name>
- All commits: <commit-list>
- Worktree at <path>
 
Type 'discard' to confirm.

git checkout <base-branch>
git branch -D <feature-branch>

git worktree list | grep $(git branch --show-current)

git worktree remove <worktree-path>