finishing-a-development-branch
npx machina-cli add skill a5c-ai/babysitter/finishing-a-development-branch --openclawFiles (1)
SKILL.md
869 B
Finishing a Development Branch
Overview
Verify tests, present structured options, execute chosen workflow, clean up.
Core principle: Verify tests -> Present options -> Execute choice -> Clean up.
Options
- Merge back to base branch locally
- Push and create a Pull Request
- Keep the branch as-is
- Discard this work (requires typed confirmation)
Process
- Verify all tests pass (STOP if they fail)
- Determine base branch
- Present exactly 4 options
- Execute chosen option
- Clean up worktree (Options 1 and 4 only)
Agents Used
- Process agents referenced in workflow processes
Tool Use
Referenced by executing-plans and subagent-driven-development processes.
Source
git clone https://github.com/a5c-ai/babysitter/blob/main/plugins/babysitter/skills/babysit/process/methodologies/superpowers/skills/finishing-a-development-branch/SKILL.mdView on GitHub Overview
After implementation, verify tests pass and decide how to integrate the work. This skill guides you from test verification to presenting four integration options, executing the chosen workflow, and cleaning up the worktree.
How This Skill Works
It first verifies that all tests pass, then determines the base branch. It then presents exactly four integration options, executes the selected option, and finally cleans up the worktree for merge-back or discard paths.
When to Use It
- When implementation is complete and tests pass, and you need a plan for integrating the changes.
- When you want to push and create a Pull Request for code review.
- When you prefer merging back to the base branch locally.
- When you want to discard the work and reset the branch (requires typed confirmation).
- When you want to keep the branch as-is for future work or experimentation.
Quick Start
- Step 1: Verify all tests pass and determine the base branch.
- Step 2: Present exactly four options and choose one to execute.
- Step 3: Execute the chosen option and clean up the worktree if applicable.
Best Practices
- Verify tests pass before deciding an integration path.
- Determine the base branch early to align the integration path.
- Present exactly four options to avoid decision paralysis.
- Document and communicate the chosen integration path to stakeholders.
- Clean up the local worktree only for merge-back or discard options to prevent clutter.
Example Use Cases
- Completed feature branch with all tests passing, and you merge back to the base branch locally.
- Work pushed and a Pull Request is opened for review and discussion.
- Branch stays as-is for a long-running experiment while other work proceeds.
- Option to discard the work after confirmation due to scope change.
- CI/CD automation triggers the finishing process as part of a pipeline.
Frequently Asked Questions
Add this skill to your agents