moliboy5000/.claude/skill-finish-branch

# Run project's test suite
npm test        # JavaScript/TypeScript
pytest          # Python
cargo test      # Rust
go test ./...   # Go

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

# Identify the base branch
git merge-base HEAD main 2>/dev/null || \
git merge-base HEAD master 2>/dev/null || \
git merge-base HEAD develop 2>/dev/null

✅ Implementation complete. Tests passing. What would you like to do?
 
1.**Merge locally** - Merge back to <base-branch> on this machine
2.**Create PR** - Push and create a Pull Request for review
3.**Keep as-is** - Leave the branch, I'll handle it later
4.**Discard** - Delete this work permanently
 
Which option? (1-4)

# Get current branch name
FEATURE_BRANCH=$(git branch --show-current)
BASE_BRANCH="main"  # or detected base
 
# Switch to base branch
git checkout $BASE_BRANCH
 
# Pull latest
git pull origin $BASE_BRANCH
 
# Merge feature branch
git merge $FEATURE_BRANCH
 
# Verify tests on merged result
npm test  # or appropriate test command
 
# If tests pass, delete feature branch
git branch -d $FEATURE_BRANCH

✅ Merged $FEATURE_BRANCH into $BASE_BRANCH
✅ Tests pass on merged result
✅ Feature branch deleted
 
Ready to push when you want: git push origin $BASE_BRANCH

# Get branch info
FEATURE_BRANCH=$(git branch --show-current)
 
# Push branch
git push -u origin $FEATURE_BRANCH
 
# Create PR with description
gh pr create \
  --title "feat: [description]" \
  --body "$(cat <<'EOF'
## Summary
- [What changed]
- [Why it changed]
 
## Test Plan
- [x] Unit tests pass
- [x] Manual verification done
- [ ] Code review needed
EOF
)"

✅ Branch pushed to origin/$FEATURE_BRANCH
✅ PR created: https://github.com/owner/repo/pull/123
 
Branch preserved for review process.

✅ Keeping branch $FEATURE_BRANCH as-is.
 
Current state:
- Branch: $FEATURE_BRANCH
- Commits ahead of $BASE_BRANCH: N
- Tests: Passing
 
When ready, you can:
- Merge: git checkout main && git merge $FEATURE_BRANCH
- PR: git push -u origin $FEATURE_BRANCH && gh pr create
- Discard: git branch -D $FEATURE_BRANCH

⚠️ This will PERMANENTLY delete:
- Branch: $FEATURE_BRANCH
- All commits:
  - abc1234 feat: add user validation
  - def5678 fix: handle edge case
  - ghi9012 test: add integration tests
 
Type 'discard' to confirm, or anything else to cancel.

# Switch to base branch first
git checkout $BASE_BRANCH
 
# Force delete the feature branch
git branch -D $FEATURE_BRANCH
 
# If remote exists, delete it too (with confirmation)
git push origin --delete $FEATURE_BRANCH 2>/dev/null || true

✅ Branch $FEATURE_BRANCH deleted locally
✅ Remote branch deleted (if existed)
 
Work has been permanently discarded.

# Check if current directory is a worktree
if git worktree list | grep -q "$(pwd)"; then
  # Get worktree path
  WORKTREE_PATH=$(pwd)
  
  # Switch to main worktree
  cd $(git worktree list | head -1 | awk '{print $1}')
  
  # Remove the worktree
  git worktree remove "$WORKTREE_PATH"
  
  echo "✅ Worktree cleaned up"
fi

# After tangle (develop) phase completes successfully
# After ink (deliver) phase validates the work
 
# User says: "I'm done, create a PR"
# → Invoke finishing-branch skill
# → Verify tests
# → Present options
# → Execute Option 2 (Create PR)

# Run octopus validation before finishing
${HOME}/.claude-octopus/plugin/scripts/orchestrate.sh ink "Validate before merge"
 
# If validation passes, proceed with finishing-branch

Finishing branch → Tests verified AND user chose option
Otherwise → Not complete