skills.rest
macintorsten
macintorstenCOMMUNITY
Explore all skills by this author →
GitHub

finishing-a-development-branch

Guides completion of development branches through structured merge, PR, or discard options.

Updated Dec 23, 2025
Search Tags:#git#workflow#testing#pull request#worktree#merge#branch
One-click install
npx skills add https://github.com/macintorsten/aurapod --skill finishing-a-development-branch-macintorsten
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: finishing-a-development-branch
Source: https://github.com/macintorsten/aurapod/tree/main/.github/skills/finishing-a-development-branch
Command: npx skills add https://github.com/macintorsten/aurapod --skill finishing-a-development-branch-macintorsten

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? When implementation work is done, developers often face ambiguity about how to integrate the branch safely. This Skill removes that guesswork by verifying tests first, then presenting exactly four structured options for merging, creating a pull request, keeping, or discarding the work. ## Core Features & Use Cases - Test Verification Gate: Runs the project's test suite before offering any integration options and stops if tests fail. - Structured Completion Options: Presents exactly four choices—local merge, push and create PR, keep as-is, or discard with typed confirmation. - Worktree Cleanup: Automatically removes git worktrees for merge and discard paths while preserving them when a PR or branch retention is chosen. - Use Case: After finishing a feature branch in a worktree, invoke this Skill to verify tests pass, choose "Push and create a Pull Request", and have the branch pushed, a PR created via gh, and the worktree cleaned up. ## Quick Start Use the finishing-a-development-branch skill to complete my current feature branch now that all tests pass.

Frequently Asked Questions about finishing-a-development-branch

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I finish a development branch after implementation is complete?▼

First verify the project's test suite passes, then choose one of four options: merge locally to the base branch, push and create a pull request, keep the branch as-is, or discard the work. The Skill executes the chosen git workflow and cleans up the worktree when appropriate.

How to create a pull request from a feature branch using git and gh?▼

Push the branch with git push -u origin, then run gh pr create with a title and body containing a summary and test plan. The Skill generates this PR automatically when you select the push-and-PR option.

Can I merge a branch if some tests are failing?▼

No. The Skill stops immediately when tests fail, displays the failures, and refuses to proceed with any merge or PR until the test suite passes. This prevents broken code from reaching the base branch.

When does the Skill remove the git worktree?▼

The worktree is removed only after a local merge or a confirmed discard. For pull request and keep-as-is options, the worktree is preserved so the branch remains available for review or later work.

How do I safely discard a feature branch without losing work accidentally?▼

The discard option requires typing the exact word 'discard' after showing the branch name, commit list, and worktree path to be deleted. Only after this confirmation does it force-delete the branch and remove the worktree.

Related Skills

Explore More Software Engineering Skills→
openaiopenai
5.3k

finishing-a-development-branch

Guides merging, pushing, or keeping a completed development branch with worktree cleanup.

Official
Advanced
taracodlabstaracodlabs
799

github-pr-workflow

Manages the full GitHub pull request lifecycle using the gh CLI.

Official
Intermediate
zizzfizzixzizzfizzix

code-review

Automate code review for architectural, security, and quality compliance.

Community
Advanced
kieranpottskieranpotts

merge

Integrates work between Git branches using the merge strategy matching their branch types.

Community
Advanced