Finishing Development Branches
Quick Start
- Code Complete - All acceptance criteria met, edge cases handled, no TODOs
- Quality Assurance - Tests pass, coverage met, lint clean, build succeeds
- Documentation - README, API docs, inline comments updated
- Git Hygiene - Rebase on main, clean commit history, no conflicts
- PR Ready - Complete description, screenshots, reviewers assigned
Features
| Feature |
Description |
Guide |
| Code Completeness |
All requirements implemented |
Check acceptance criteria, edge cases, cleanup |
| Quality Gates |
Automated validation |
Tests, lint, types, security, build |
| TODO Scanner |
Find unaddressed items |
TODO, FIXME, HACK, XXX patterns |
| Git Preparation |
Clean history for merge |
Rebase, squash WIP, conventional commits |
| PR Generation |
Comprehensive description |
Summary, changes, testing, screenshots |
| Verification Script |
Final pre-PR check |
Run all gates, generate report |
Common Patterns
# Completion Checklist
PHASE 1: CODE COMPLETE
[ ] All acceptance criteria implemented
[ ] Edge cases handled
[ ] Error handling complete
[ ] No TODO/FIXME unaddressed
[ ] Debug code removed
PHASE 2: QUALITY ASSURANCE
[ ] All tests passing
[ ] Coverage meets threshold (80%+)
[ ] Lint/format passing
[ ] Type checking passing
[ ] Security scan passing
PHASE 3: DOCUMENTATION
[ ] README updated if needed
[ ] API documentation updated
[ ] Complex logic commented
PHASE 4: GIT HYGIENE
[ ] Rebased on latest main
[ ] Commit history clean
[ ] Conventional commit messages
[ ] No merge conflicts
PHASE 5: PR READY
[ ] Description complete
[ ] Screenshots for UI changes
[ ] Reviewers assigned
# Git Preparation
git fetch origin main
git rebase origin/main
# Review commits for squashing
git log --oneline main..HEAD
# Consider squashing: fix, wip, temp commits
git rebase -i main
# Push with lease (safe force)
git push origin feature-branch --force-with-lease
# Quality verification
npm run lint && npm run typecheck && npm test && npm run build
# PR Description Template
## Summary
[2-3 sentences on what/why]
## Changes
- [Change 1]
- [Change 2]
## Testing
- [x] Unit tests
- [x] Integration tests
- [ ] Manual testing
## Screenshots
[For UI changes]
## Checklist
- [x] Self-review completed
- [x] Tests pass
- [x] Documentation updated
Best Practices
| Do |
Avoid |
| Run all checks locally before pushing |
Pushing broken code |
| Rebase on latest main to avoid conflicts |
Force pushing without --force-with-lease |
| Squash WIP commits into meaningful units |
Leaving fix/wip/temp commits |
| Write clear conventional commit messages |
Cryptic commit messages |
| Include screenshots for UI changes |
Creating PRs without descriptions |
| Self-review your diff before requesting |
Leaving debug statements in code |
| Test in clean environment if possible |
Skipping tests to save time |
| Link to related tickets in PR |
Ignoring linting warnings |
Related Skills
requesting-code-reviews - Write effective review requestsverifying-before-completion - Quality gate checklistswriting-plans - Plan completion criteria upfrontexecuting-plans - Track progress to completion
Converted and distributed by TomeVault — claim your Tome and manage your conversions.
1---2name: finishing-development-branches3description: AI agent completes development branches with comprehensive quality gates, clean git history, and thorough PR preparation. Use when wrapping up features, preparing for merge, or finalizing PRs. Use when this capability is needed.4---56# Finishing Development Branches78## Quick Start9101. **Code Complete** - All acceptance criteria met, edge cases handled, no TODOs112. **Quality Assurance** - Tests pass, coverage met, lint clean, build succeeds123. **Documentation** - README, API docs, inline comments updated134. **Git Hygiene** - Rebase on main, clean commit history, no conflicts145. **PR Ready** - Complete description, screenshots, reviewers assigned1516## Features1718| Feature | Description | Guide |19|---------|-------------|-------|20| Code Completeness | All requirements implemented | Check acceptance criteria, edge cases, cleanup |21| Quality Gates | Automated validation | Tests, lint, types, security, build |22| TODO Scanner | Find unaddressed items | `TODO`, `FIXME`, `HACK`, `XXX` patterns |23| Git Preparation | Clean history for merge | Rebase, squash WIP, conventional commits |24| PR Generation | Comprehensive description | Summary, changes, testing, screenshots |25| Verification Script | Final pre-PR check | Run all gates, generate report |2627## Common Patterns2829```30# Completion Checklist31PHASE 1: CODE COMPLETE32[ ] All acceptance criteria implemented33[ ] Edge cases handled34[ ] Error handling complete35[ ] No TODO/FIXME unaddressed36[ ] Debug code removed3738PHASE 2: QUALITY ASSURANCE39[ ] All tests passing40[ ] Coverage meets threshold (80%+)41[ ] Lint/format passing42[ ] Type checking passing43[ ] Security scan passing4445PHASE 3: DOCUMENTATION46[ ] README updated if needed47[ ] API documentation updated48[ ] Complex logic commented4950PHASE 4: GIT HYGIENE51[ ] Rebased on latest main52[ ] Commit history clean53[ ] Conventional commit messages54[ ] No merge conflicts5556PHASE 5: PR READY57[ ] Description complete58[ ] Screenshots for UI changes59[ ] Reviewers assigned60```6162```bash63# Git Preparation64git fetch origin main65git rebase origin/main6667# Review commits for squashing68git log --oneline main..HEAD69# Consider squashing: fix, wip, temp commits70git rebase -i main7172# Push with lease (safe force)73git push origin feature-branch --force-with-lease7475# Quality verification76npm run lint && npm run typecheck && npm test && npm run build77```7879```80# PR Description Template81## Summary82[2-3 sentences on what/why]8384## Changes85- [Change 1]86- [Change 2]8788## Testing89- [x] Unit tests90- [x] Integration tests91- [ ] Manual testing9293## Screenshots94[For UI changes]9596## Checklist97- [x] Self-review completed98- [x] Tests pass99- [x] Documentation updated100```101102## Best Practices103104| Do | Avoid |105|----|-------|106| Run all checks locally before pushing | Pushing broken code |107| Rebase on latest main to avoid conflicts | Force pushing without --force-with-lease |108| Squash WIP commits into meaningful units | Leaving fix/wip/temp commits |109| Write clear conventional commit messages | Cryptic commit messages |110| Include screenshots for UI changes | Creating PRs without descriptions |111| Self-review your diff before requesting | Leaving debug statements in code |112| Test in clean environment if possible | Skipping tests to save time |113| Link to related tickets in PR | Ignoring linting warnings |114115## Related Skills116117- `requesting-code-reviews` - Write effective review requests118- `verifying-before-completion` - Quality gate checklists119- `writing-plans` - Plan completion criteria upfront120- `executing-plans` - Track progress to completion121122---123> Converted and distributed by [TomeVault](https://tomevault.io/claim/doanchienthangdev) — claim your Tome and manage your conversions.124<!-- tomevault:4.0:skill_md:2026-04-13 -->
tomevault-io