skills.rest
thermiteau
thermiteauOFFICIAL
Explore all skills by this author →
WebsiteGitHub

git-workflow

Enforce Gitflow branching, conventional commits, and merge conflict resolution.

Updated Aug 23, 2026
Search Tags:#git#workflow#collaboration#version control#branching#commits
One-click install
npx skills add https://github.com/thermiteau/claude-vps --skill git-workflow-thermiteau
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/thermiteau/claude-vps/tree/main/src/skills/git-workflow
Command: npx skills add https://github.com/thermiteau/claude-vps --skill git-workflow-thermiteau

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill streamlines your Git workflow by enforcing a consistent branching strategy, commit message format, and conflict resolution process, ensuring cleaner history and easier collaboration.

Core Features & Use Cases

  • Branching Strategy: Implements a simplified Gitflow with clear roles for main, develop, and feature branches.
  • Conventional Commits: Enforces a standardized commit message format for better readability and automated changelog generation.
  • Conflict Resolution Guidance: Provides clear steps for handling merge conflicts, prioritizing safety and clarity.
  • Use Case: When starting a new feature, this skill guides you to create a correctly named branch from develop, make commits following the conventional commit format, and provides instructions on how to handle merge conflicts when they arise.

Quick Start

Use the git-workflow skill to create a new feature branch named 'feat/123-add-user-auth' from the 'develop' branch.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I structure Git branches for team collaboration?▼

Git branches for team collaboration are structured using a simplified Gitflow model with protected main, develop, and feature branches to ensure a clean history and clear roles during development.

What is the conventional commit format for version control?▼

The conventional commit format for version control standardizes commit messages to improve readability and enable automated changelog generation across your project's history.

How do I create a feature branch from develop in Git?▼

To create a feature branch from develop in Git, name it according to specific conventions like 'feat/123-add-user-auth' to maintain clarity and enforce branch naming automation.

What's the best way to handle merge conflicts in Git?▼

Handling merge conflicts in Git requires following clear resolution steps that prioritize safety and clarity, ensuring conflicting changes are merged without corrupting the codebase.

Does enforcing a Git branching strategy require protected branches?▼

Enforcing a simplified Gitflow strategy requires protected branches like main and develop to prevent direct commits, ensuring code management stability and consistent collaboration.

Why use conventional commits in a Git workflow?▼

Using conventional commits in a Git workflow enforces a standardized message format for better readability, clearer collaboration, and automated changelog generation across the version control process.

Related Skills

Explore More Software Engineering Skills→
Tx1207Tx1207
5

project-creator

Create a new project from a template, initialize uv, and configure a local Git repository.

Community
Advanced
CleanExpoCleanExpo
1

Changelog Generator

Generate changelogs from Conventional Commits with semantic versioning for NodeJS projects.

Community
Intermediate
vstorm-covstorm-co
1.0k

git-workflow

Manage git commits, branches, pull requests, and conflict resolution.

Official
Intermediate
Ayub-KhanAyub-Khan

git-workflow

Document Git branching strategies, merge rules, and commit conventions.

Community
Advanced