skills.rest
thejordanleopold
thejordanleopoldCOMMUNITY
Explore all skills by this author →
Website𝕏@jordansleopoldGitHub

git-workflow

Enforce trunk-based Git workflows with atomic commits and branch cleanup.

4|Updated Apr 9, 2026
Search Tags:#git#workflow#worktrees#branching#code-review#atomic-commits#commit-messages
One-click install
npx skills add https://github.com/thejordanleopold/claude-code-skills-distilled --skill git-workflow-thejordanleopold
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/thejordanleopold/claude-code-skills-distilled/tree/main/git-workflow
Command: npx skills add https://github.com/thejordanleopold/claude-code-skills-distilled --skill git-workflow-thejordanleopold

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Coordinated Git practices reduce mis-steps, reduce merge conflicts, and keep the main branch deployable by guiding teams through atomic commits, disciplined branching, and safe cleanup routines.

Core Features & Use Cases

  • Trunk-based development with an always-deployable main
  • Atomic commits and standardized commit messages
  • Clear branching strategy and PR/workflow guidance
  • Use of git worktrees for parallel work and safe experimentation
  • Finish or discard development branches with controlled options
  • Safe cleanup and verification practices to maintain repository hygiene

Quick Start

Start by aligning your team to main-trunk discipline and create a feature/branch following naming conventions, then implement and commit atomic changes.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
What is trunk-based development and how does it keep the main branch deployable?▼

Trunk-based development keeps the main branch deployable by enforcing atomic commits, disciplined branching, and safe cleanup routines to reduce merge conflicts and maintain repository hygiene across teams.

How do I use git worktrees for parallel feature development?▼

Git worktrees allow you to manage multiple branches simultaneously for parallel work and safe experimentation, implementing atomic changes independently while maintaining an always-deployable main trunk.

What's the best way to structure atomic commits and standardized commit messages?▼

Structure atomic commits by implementing isolated, single-purpose changes paired with standardized commit messages, following trunk-based discipline to ensure review-friendly guidelines and a deployable main branch.

How do I safely cleanup and discard development branches after merging?▼

Safely cleanup development branches by finishing or discarding them with controlled options and verification practices, maintaining repository hygiene after merging feature work back to the main trunk.

Does this Git workflow support team code review and branching strategies?▼

Yes, this Git workflow supports team code review through clear branching strategies, PR guidance, review-friendly guidelines, and standardized commit messages enforced by trunk-based discipline for coordinated collaboration.

Related Skills

Explore More Software Engineering Skills→
alexanderopalexanderop

using-git-worktrees

Create isolated git worktrees for feature branches with safety checks.

Community
Advanced
jota-batutajota-batuta

git-workflow-and-versioning

Standardize trunk-based development and atomic commits for CI/CD workflows.

Community
Intermediate
meistro57meistro57
1

laravel:quality-checks

Run automated quality gates for Laravel projects with Pint, PHPStan, and frontend linters.

Community
Intermediate
autohandaiautohandai
10

git-workflow-mastery

Configure Git branching strategies and conventional commit workflows.

Official
Advanced