git-workflow

Standardize Git workflows with Conventional Commits and branch strategies.

5|2|Updated Jul 2, 2026
One-click install
npx skills add https://github.com/Tx1207/hello-scholar --skill git-workflow-tx1207
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/Tx1207/hello-scholar/tree/main/skills/core/git-workflow
Command: npx skills add https://github.com/Tx1207/hello-scholar --skill git-workflow-tx1207

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Git workflows often vary across teams, leading to inconsistent commit messages, divergent branch strategies, and inefficient code review processes. This skill standardizes the team-wide Git workflow to improve collaboration, traceability, and release reliability.

Core Features & Use Cases

  • Commit message standards based on Conventional Commits (feat, fix, docs, refactor, perf, test, chore)
  • Branching strategies including master, develop, feature, bugfix, hotfix, and release with merge policies
  • Pull Request guidelines, code review criteria, and a clear merge decision flow
  • Conflict resolution practices and reference workflows to minimize integration pain
  • Use Case: A development team adopts a unified workflow to streamline PR reviews and maintain a clean, navigable history

Quick Start

Explain and implement a team Git workflow by creating a feature branch, following Conventional Commits, and reviewing a PR.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
What is a standardized Git workflow and why do development teams need it?

A standardized Git workflow enforces consistent commit messages, branch strategies, and pull request guidelines to improve collaboration and reduce merge conflicts. Development teams need it to maintain a clean, navigable history and ensure release reliability across feature work and hotfixes.

How do I use Conventional Commits to standardize team pull requests and branching?

To standardize pull requests and branching with Conventional Commits, apply specific prefixes like feat, fix, docs, refactor, perf, test, and chore to commit messages. Combine this with defined branch types such as feature, bugfix, and hotfix to streamline PR reviews and establish clear merge policies.

What's the best way to resolve Git merge conflicts during a release cycle?

The best way to resolve Git merge conflicts during a release cycle is to follow standardized conflict resolution practices and reference workflows. Applying clear merge strategies and branch policies minimizes integration pain and ensures smooth code integration across feature branches.

How do I create a feature branch and follow Git workflow guidelines step by step?

To create a feature branch and follow Git workflow guidelines, start by branching from the appropriate base, implement changes using Conventional Commits, and then open a pull request. The PR should adhere to established code review criteria and merge decision flows to ensure quality.

Does this Git workflow support both hotfixes and regular feature development?

Yes, this Git workflow supports both hotfixes and regular feature development. It defines specific branching strategies and merge policies for master, develop, feature, bugfix, hotfix, and release branches to handle typical software development scenarios efficiently.

When should I use a release branch instead of merging directly to master in version control?

You should use a release branch instead of merging directly to master when preparing for a production deployment. This version control approach isolates release stabilization efforts, allowing final testing and hotfixes without disrupting ongoing feature development on the develop branch.