finishing-a-development-branch

The finishing-a-development-branch skill provides a standardized, reliable protocol for wrapping up software engineering tasks within a git-based workflow. It acts as the final gatekeeper in the development lifecycle, ensuring that code is not only functionally complete but also properly integrated into the project's main branch. This skill is specifically designed for software agents operating in collaborative environments where testing rigor and repository cleanliness are paramount. It prevents common pitfalls such as merging broken code or leaving dangling feature branches, providing a guided, deterministic experience for the agent.

• Automatically runs project-specific test suites (npm, cargo, pytest, go test) to verify implementation before proceeding.

• Dynamically determines the appropriate base branch (main or master) using git merge-base.

• Presents four distinct, non-ambiguous workflow options: local merge, remote push with pull request creation, preservation of work-in-progress, or permanent discard.

• Manages complex cleanup tasks, including the removal of git worktrees when the feature branch is merged or deleted, preventing workspace clutter.

• Enforces safety checks, such as requiring explicit human confirmation before executing destructive actions like branch deletion.

• This skill is intended for automated coding assistants and should be triggered at the conclusion of development tasks or after completing a subagent-driven development plan.

• Expects a clean development environment with test suites properly configured in the repository.

• Provides clear feedback via standard terminal output, ensuring the agent remains transparent about its decision-making process.

• Requires consistent input from the user when choosing between merge, PR, or cleanup strategies, facilitating a human-in-the-loop validation step.

• Adheres strictly to the principles of safe software integration, rejecting any attempt to merge code if the underlying test suite reports failures.