finishing-a-development-branch

Verify tests and merge, push, keep, or discard a development branch.

68|6|Updated Apr 16, 2020
One-click install
npx skills add https://github.com/zenobi-us/dotfiles --skill finishing-a-development-branch-zenobi-us
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: finishing-a-development-branch
Source: https://github.com/zenobi-us/dotfiles/tree/main/devtools/files/opencode/skills/finishing-a-development-branch
Command: npx skills add https://github.com/zenobi-us/dotfiles --skill finishing-a-development-branch-zenobi-us

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solves? After completing development, integrating changes back into the main codebase can be error-prone without proper test verification and a clear, structured merge strategy.

Core Features & Use Cases

  • Mandatory Test Verification: Ensures all project tests pass before offering any completion options, preventing broken merges.
  • Structured Completion Options: Presents clear choices for merging locally, pushing for a Pull Request, keeping the branch, or discarding work.
  • Automated Cleanup: Handles the cleanup of feature branches and associated Git worktrees upon completion.
  • Use Case: You've finished implementing a new feature, and all local tests pass. Use this Skill to verify the test suite, then choose to either merge your branch locally, push and create a Pull Request, or discard the work, ensuring a clean and verified integration.

Quick Start

Use the finishing-a-development-branch skill to complete work on your 'feature/user-profile' branch, verifying tests and then merging it to main.

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 merge a development branch after tests pass?

Merging a development branch involves verifying tests pass, selecting your merge strategy—locally, via pull request, or keeping the branch as-is—then executing that choice. This Skill automates test verification and presents all four options, letting you choose the integration method that fits your workflow before cleanup.

What's the best way to integrate feature branches into main?

A structured merge process ensures tests pass first, then offers explicit options: merge locally to main, push and create a pull request for review, keep the branch for later, or discard it. This prevents broken merges and gives you control over integration timing and visibility.

How do I clean up Git branches after merging?

Branch cleanup removes feature branches and associated Git worktrees after integration. This Skill automates cleanup as part of the completion workflow, so you don't manually track which branches to remove after merging or pushing your changes.

Can I create a pull request from a development branch without merging locally?

Yes. This Skill offers a push-and-create-PR option that skips local merging entirely. You choose to push your branch and create a pull request for code review before any integration, keeping your branch separate until approval.

What happens if tests fail before I finish a development branch?

Test verification is mandatory before any completion option appears. If tests fail, the Skill stops and prevents you from merging, pushing, or discarding until tests pass, ensuring only verified code enters the main codebase.

How do I decide between local merge and pull request workflows?

Local merge integrates immediately without review; pull request adds a review gate before integration. This Skill presents both explicitly so you choose based on your team's approval process, code review needs, and whether work should be visible before merging.