industrial/_project-template/skill-finishing-a-development-branch

Claude Code and agent skill by industrial/_project-template

Trust tier 3
  • community
Source check pending

Checking that the SKILL.md file is still in the repository.

Use when implementation is complete, all tests pass, and you need to decide how to integrate the work - guides completion of development work by presenting structured options for merge, PR, or cleanup

Install

npx vskill@latest install industrial/_project-template/skill-finishing-a-development-branch

SKILL.md

The same SKILL.md was published earlier as industrial/_project-template/skill-finishing-a-development-branch.

Finishing a Development Branch

Use when implementation is complete, all tests pass, and you need to decide how to integrate the work - guides completion of development work by presenting structured options for merge, PR, or cleanup

Overview

Guide completion of development work by presenting clear options and handling chosen workflow.

Core principle: Verify tests → Present options → Execute choice → Clean up.

Announce at start: "I'm using the finishing-a-development-branch skill to complete this work."

The Process

✅ Good: Step 1: Verify Tests
bash
# Run project's test suite
npm test / cargo test / pytest / go test ./...
✅ Good: Step 2: Determine Base Branch
bash
# Try common base branches
git merge-base HEAD main 2>/dev/null || git merge-base HEAD master 2>/dev/null
✅ Good: Step 3: Present Options
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?
✅ Good: Option 1: Merge Locally
bash
# 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>
✅ Good: Option 2: Push and Create PR
bash
# 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
)"
✅ Good: Option 4: Discard
This will permanently delete:
- Branch <name>
- All commits: <commit-list>
- Worktree at <path>
Type 'discard' to confirm.
✅ Good: Step 5: Cleanup Worktree
bash
git worktree list | grep $(git branch --show-current)

Quick Reference

OptionMergePushKeep WorktreeCleanup Branch
1. Merge locally✓--✓
2. Create PR-✓✓-
3. Keep as-is--✓-
4. Discard---✓ (force)

Common Mistakes

  • Skipping test verification
  • Problem: Merge broken code, create failing PR
  • Fix: Always verify tests before offering options
  • Open-ended questions
  • Problem: "What should I do next?" → ambiguous
  • Fix: Present exactly 4 structured options
  • Automatic worktree cleanup
  • Problem: Remove worktree when might need it (Option 2, 3)
  • Fix: Only cleanup for Options 1 and 4
  • No confirmation for discard
  • Problem: Accidentally delete work
  • Fix: Require typed "discard" confirmation

Red Flags

  • Never:
  • Proceed with failing tests
  • Merge without verifying tests on result
  • Delete work without confirmation
  • Force-push without explicit request
  • Always:
  • Verify tests before offering options
  • Present exactly 4 options
  • Get typed confirmation for Option 4
  • Clean up worktree for Options 1 & 4 only

Integration

  • Called by:
  • subagent-driven-development (Step 7) - After all tasks complete
  • executing-plans (Step 5) - After all batches complete
  • Pairs with:
  • using-git-worktrees - Cleans up worktree created by that skill

Security

  • Security scanPassed, 90 of 100Pattern checks on the skill's files.
  • Model reviewPassed

Quality evaluation

  • Task evaluationNot runNo evaluation yet. Run one in Skill Studio.

Source

Popularity

7-day trend score
0

Not refreshed yet.

Works with

Any agent vskill installs to: 56 targets in all. These 39 have a page on this site.

  • Claude Code
  • Cursor
  • GitHub Copilot
  • Windsurf
  • Codex
  • Gemini CLI
  • Cline
  • Amp
  • Roo Code
  • Goose
  • Continue
  • Kilo Code
  • Junie
  • Trae
  • OpenHands
  • Qwen Code
  • AI Agent
  • Tabnine Chat
  • Sourcegraph Cody
  • Amazon Q
  • Firebase Genkit
  • Sweep
  • Devin
  • Phind
  • Mentat
  • Claude Desktop
  • Aider
  • GPT Pilot
  • Plandex
  • bolt.new
  • v0
  • Replit Agent
  • Anse
  • TypingMind
  • BetterChatGPT
  • LibreChat
  • Warp AI
  • Pieces
  • Fig AI
Embed badge
vskill VERIFIED badge
[![vskill VERIFIED](https://verified-skill.com/api/v1/skills/industrial/_project-template/skill-finishing-a-development-branch/badge)](https://verified-skill.com/skills/industrial/_project-template/skill-finishing-a-development-branch)

Something wrong with this skill or its page? Tell us.