skills.rest
klh
klhCOMMUNITY
Explore all skills by this author →
Website𝕏@klhougesenGitHub

git-workflow-and-versioning

Standardize Git workflows with trunk-based development and atomic commits.

9|Updated Apr 3, 2026
Search Tags:#git#worktrees#branching#commits#workflows#code-review#version-control
One-click install
npx skills add https://github.com/klh/speedy-claude --skill git-workflow-and-versioning-klh
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow-and-versioning
Source: https://github.com/klh/speedy-claude/tree/main/skills/git-workflow-and-versioning
Command: npx skills add https://github.com/klh/speedy-claude --skill git-workflow-and-versioning-klh

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Structures git workflow practices. Use when making any code change. Use when committing, branching, resolving conflicts, or when you need to organize work across multiple parallel streams.

Core Features & Use Cases

  • Establish trunk-based development practices to keep main deployable
  • Enforce atomic commits and descriptive messages to improve history traceability
  • Define branch management strategies, naming conventions, and cross-worktree coordination

Quick Start

Begin applying trunk-based development and atomic-commit practices to your next code change.

Frequently Asked Questions about git-workflow-and-versioning

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

FAQPage Schema
How do I manage git worktrees for parallel development streams?▼

Git worktrees coordinate multiple parallel streams by allowing you to manage branches simultaneously without stashing. This approach standardizes branch management strategies and naming conventions to keep your active streams organized.

What is trunk-based development and how does it keep main deployable?▼

Trunk-based development is a git workflow practice that keeps the main branch deployable by enforcing short-lived branches and frequent merges. It establishes continuous integration discipline to ensure your codebase remains stable and release-ready.

How do I enforce atomic commits and descriptive messages in git?▼

Atomic commits are enforced by standardizing your git workflow to bundle single, self-contained logical changes with clear, descriptive messages. This discipline improves history traceability and makes code review more effective.

What's the best way to resolve git conflicts during branch management?▼

The best way to resolve git conflicts is by applying standardized workflow practices that guide branch coordination and integration. This ensures safe conflict resolution while maintaining the integrity of your version control history.

Does this git workflow approach require any specific dependencies or tools?▼

No, this git workflow approach does not require any specific dependencies or external tools. It applies standard version control practices directly to any code change process, including committing, branching, and conflict resolution.

Related Skills

Explore More Software Engineering Skills→
alexanderopalexanderop

using-git-worktrees

Create isolated git worktrees for feature branches with safety checks.

Community
Advanced
mr-daedaliummr-daedalium
107

land-and-deploy

Merge PRs, trigger deployment, and verify canary health in CI/CD pipelines.

Community
Advanced
seo-jinseokseo-jinseok

moai-workflow-loop

Integrate LSP diagnostics and AST-grep scanning into an automated code quality feedback loop.

Community
Advanced
sddevelopment-besddevelopment-be
13

Approach: Trunk-Based Development for Agent-First Workflows

Enforce trunk-based development workflows on the main branch for agent-first collaboration.

Official
Intermediate