Why use Git worktrees instead of standard branching?

Worktrees allow you to have multiple branches checked out in different directories simultaneously, enabling faster context switching without the need to stash or commit unfinished work.

What defines a 'stale' worktree in this workflow?

A worktree is considered stale if its remote branch has been deleted or if its associated PR has been merged with no new local commits. The skill prevents the removal of worktrees with uncommitted changes.

How does this skill help with merge conflicts?

It provides a structured methodology and specific Git commands to analyze changes, check common ancestors, and resolve conflicts based on logic and intent rather than just choosing 'ours' or 'theirs'.

Can I use this skill with existing Git repositories?

Yes, this skill is designed to work with any Git repository. It simply requires adopting the structured path layout (~/git/repo/branch) to manage development effectively.

Git Workflow Standards

Name: Git Workflow Standards
Author: JacobPEvans

byJacobPEvans

•

개발자 도구

Enforces professional Git worktree management and branch hygiene protocols for clean, isolated development environments.

This skill provides a robust framework for managing Git repositories using a worktree-first approach, ensuring that the main branch remains a stable reference while development occurs in dedicated, type-specific directories. It standardizes branch naming conventions for features, bugfixes, and releases, while providing a rigorous protocol for merge conflict resolution and automated repository hygiene. By using this skill, developers can eliminate the friction of context switching and maintain a pristine commit history through automated sync and rebase workflows.

주요 기능

01Standardized branch categorization (feature, bugfix, hotfix, chore)

02Automated sync protocols for maintaining up-to-date main and feature branches

03Dedicated Git Worktree management for isolated branch development

04Structured merge conflict resolution with specific analysis commands

052 GitHub stars

06Intelligent stale worktree identification and safe removal logic

사용 사례

01Managing multiple concurrent feature branches without stashing or switching contexts

02Resolving complex merge conflicts using a logical decision matrix and ancestor analysis

03Automating repository cleanup by identifying merged PRs and orphaned local branches

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add jacobpevans/claude-code-plugins git-workflow-standards

For use in Claude.ai and ChatGPT

주요 기능

01Standardized branch categorization (feature, bugfix, hotfix, chore)

02Automated sync protocols for maintaining up-to-date main and feature branches

03Dedicated Git Worktree management for isolated branch development

04Structured merge conflict resolution with specific analysis commands

052 GitHub stars

06Intelligent stale worktree identification and safe removal logic

사용 사례

01Managing multiple concurrent feature branches without stashing or switching contexts

02Resolving complex merge conflicts using a logical decision matrix and ancestor analysis

03Automating repository cleanup by identifying merged PRs and orphaned local branches

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add jacobpevans/claude-code-plugins git-workflow-standards

For use in Claude.ai and ChatGPT