git-workflow

Manage Git worktree workflows, conventional commits, and PR guidelines.

Updated Aug 16, 2018
One-click install
npx skills add https://github.com/Cain96/dotfiles --skill git-workflow-cain96
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/Cain96/dotfiles/tree/main/dot_config/claude/skills/git-workflow
Command: npx skills add https://github.com/Cain96/dotfiles --skill git-workflow-cain96

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps teams adopt a modern Git worktree workflow, aligns commit messages with conventional formats, and establish PR guidelines to reduce context switching and merge conflicts.

Core Features & Use Cases

  • Git Worktree Guidance: Learn how to create and manage multiple worktrees to parallelize feature development.
  • Conventional Commits: Follow standardized commit messages to improve changelogs and review efficiency.
  • PR Guidelines: Establish best practices for pull requests, including trailers and review expectations.
  • Use Case: When developing multiple features simultaneously, create separate worktrees to avoid frequent branch switching and stash usage.

Quick Start

Run: git worktree add ../project-feature-auth feature/user-authentication git worktree add ../project-bugfix-api hotfix/api-validation git worktree list git commit -m "feat(auth): add JWT login"

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I set up Git worktrees to work on multiple branches simultaneously?

Git worktrees let you create separate working directories for different branches without switching or stashing. Use `git worktree add <path> <branch>` to create a new worktree, then work in parallel across feature and bugfix branches. Each worktree is independent, eliminating context switching overhead.

What is the conventional commits format and why does it matter for pull requests?

Conventional commits follow a standardized format—`type(scope): message`—like `feat(auth): add JWT login`. This structure improves changelog generation, speeds code review, and makes PR history searchable and consistent across multi-branch projects.

How do I reduce merge conflicts when managing multiple feature branches?

Git worktrees combined with conventional commit conventions reduce conflicts by enabling parallel development on isolated branches. Each worktree maintains its own state, and standardized commit messages clarify intent, making rebasing and merging smoother across simultaneous features.

What PR guidelines should I follow for effective code reviews?

Effective PR guidelines include commit trailers for metadata, clear conventional commit messages, and explicit review expectations. These practices, paired with worktree workflows, ensure reviewers understand context quickly and maintain code quality across multi-branch development.

Can I use Git worktrees for both feature development and bug fixes?

Yes. Git worktrees support parallel workflows for features, hotfixes, and releases. Create separate worktrees for `feature/*` and `hotfix/*` branches to isolate work streams, avoid stash juggling, and maintain clean commit histories across different development tracks.