skills.rest
AhmedElhadarey
AhmedElhadareyCOMMUNITY
Explore all skills by this author →
GitHub

finishing-a-development-branch

Verify tests and select merge, PR, keep, or discard for a feature branch.

2|Updated Feb 25, 2026
Search Tags:#git#cleanup#merge#branch#pr#tests#finish
One-click install
npx skills add https://github.com/AhmedElhadarey/Gilfoyle --skill finishing-a-development-branch-ahmedelhadarey
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: finishing-a-development-branch
Source: https://github.com/AhmedElhadarey/Gilfoyle/tree/main/skills/finishing-a-development-branch
Command: npx skills add https://github.com/AhmedElhadarey/Gilfoyle --skill finishing-a-development-branch-ahmedelhadarey

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Finishing development work on a feature branch requires validating tests, deciding the correct merge or PR path, and cleaning up afterwards. This skill provides a structured, deterministic process to verify tests, identify the base branch, present four explicit options, execute the chosen path, and perform optional cleanup.

Core Features & Use Cases

  • Verify tests and determine readiness before finishing a feature branch.
  • Determine the appropriate workflow (local merge, PR, keep, or discard) with a guided sequence.
  • Clean up worktrees and branches automatically when appropriate, reducing manual follow-up work.

Quick Start

Run the finishing-a-development-branch skill to finalize your feature branch after 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 Git feature branch with tests verified and cleanup handled?▼

Finishing a development branch requires validating tests, detecting the base branch, and selecting one of four paths: local merge, PR, keep, or discard. It executes the chosen integration path and performs optional worktree cleanup with safety checks for deterministic results.

What is the best way to merge a feature branch and clean up worktrees afterwards?▼

The best approach uses a guided sequence to verify test readiness, presents explicit merge or PR options, and executes post-merge worktree cleanup with safety checks, reducing manual follow-up work and preventing orphaned branches.

Can I choose between creating a PR or doing a local merge when finalizing my branch?▼

Yes, the workflow presents four explicit options—local merge, PR, keep, or discard—allowing you to select the integration path that best fits your team's Git workflow after tests pass.

Does this branch finishing workflow support Git worktrees and automatic branch deletion?▼

Yes, the workflow supports Git worktrees and automatic branch deletion by performing optional worktree cleanup with built-in safety checks after executing the chosen merge or PR path, removing branches when appropriate.

What happens to my feature branch if tests fail before the merge execution step?▼

If tests fail, the feature branch is not integrated. The workflow requires test verification to determine readiness before presenting merge, PR, keep, or discard options, ensuring only validated work enters the base branch.

Related Skills

Explore More Software Engineering Skills→
alffeialffei
69

finishing-a-development-branch

Automate branch finalization by verifying tests, discovering the base branch, and presenting merge, PR, or cleanup options.

Community
Advanced
tomzxtomzx
5

deploy-pr

Deploy merged PRs to target environments and run smoke tests.

Community
Intermediate
aberrantCodeaberrantCode
1

ship-to-dev

Merge feature branches into DEV after passing tests and coverage gates.

Community
Advanced
bmsull560bmsull560

jr-rebase

Resolves git rebase conflicts in feature branches via guided marker resolution.

Community
Intermediate