managing-development-branches

Manages git worktree setup, conflict resolution, and branch closure across the development lifecycle.

1|Updated Jul 17, 2026
One-click install
npx skills add https://github.com/dariovr1/sixth-sense --skill managing-development-branches-dariovr1
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: managing-development-branches
Source: https://github.com/dariovr1/sixth-sense/tree/main/skills/managing-development-branches
Command: npx skills add https://github.com/dariovr1/sixth-sense --skill managing-development-branches-dariovr1

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Feature work done directly on a shared branch risks contaminating the working tree, merge conflicts get abandoned with --abort instead of resolved, and finished branches are closed out without verified tests or a clear integration decision. This Skill structures the full branch lifecycle so isolation, conflict resolution, and cleanup each follow a safe, explicit process. ## Core Features & Use Cases - Isolated Worktree Setup: Creates a git worktree with directory selection, .gitignore verification, uncommitted-work checks, dependency installation, and a baseline test run before any code is written. - Intent-Based Conflict Resolution: Resolves merge/rebase conflicts hunk by hunk by reading both sides' commits and diffs, never aborting or inventing behavior, then re-running typecheck, tests, and lint. - Verified Branch Closure: Verifies the test suite (including historically fragile paths), presents merge/PR/keep options, writes evidence-based PR descriptions, and gates destructive branch deletion behind explicit confirmation. - Use Case: Before starting a feature, ask the assistant to set up an isolated worktree; it checks for uncommitted changes, creates the worktree, installs dependencies, and confirms a green baseline test run before you write a line of code. ## Quick Start Set up an isolated git worktree for my new feature branch and verify the baseline tests pass.

Frequently Asked Questions about managing-development-branches

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

FAQPage Schema
How do I create an isolated git worktree for a feature branch?

Run git worktree add with a new branch name after verifying the target directory is in .gitignore and the working tree has no uncommitted changes. Then install project dependencies and run the test suite to establish a clean baseline before starting work.

How do I resolve a git merge conflict without losing work?

Resolve each conflicted hunk by reading both sides' commit messages and full diffs to understand intent, preserving compatible changes from both sides. Never use git merge --abort or rebase --abort to dismiss a conflict, and rerun typecheck, tests, and lint after resolving.

What should I check before merging a finished branch?

Verify the full test suite passes and explicitly exercise any historically fragile areas named in QA checklists or project docs. Then choose between a direct merge, a pull request with evidence-based description, or keeping the branch for later work.

Why does a new git worktree miss my uncommitted changes?

A worktree branches from the last commit on the source branch, not the current working tree, so uncommitted or staged changes are invisible to it. Commit the work or stash it with git stash push -u before creating the worktree.

When is it safe to delete a branch or worktree?

Only after the user explicitly requests it and confirms a statement listing exactly what will be destroyed, including the branch name, worktree path, and any commits not present elsewhere. A generic earlier request to clean up does not count as consent.