git-workflow

Standardize Git branching, commit conventions, and PR workflows.

3|Updated Apr 18, 2026

Search Tags:#git #workflow #branching #conflict-resolution #pull-requests #commit-messages #merge-rebase

Ready to run

npx skills add https://github.com/nassimbf/ftitos-claude-code --skill git-workflow-nassimbf

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/nassimbf/ftitos-claude-code/tree/main/skills/git-workflow
Command: npx skills add https://github.com/nassimbf/ftitos-claude-code --skill git-workflow-nassimbf

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Teams often struggle with inconsistent Git workflows, conflicting conventions, and integration bottlenecks that slow deployments.

Core Features & Use Cases

Standardized branching strategies (GitHub Flow, trunk-based, GitFlow) with clear guidelines for when to create, merge, and release.
Consistent commit messages and PR descriptions to improve code review quality and traceability.
Guidance on merge vs rebase, conflict resolution, and release planning to reduce integration risk.

Quick Start

Align your team's practices by selecting a workflow pattern and documenting branch naming, PR processes, and release gates.

Frequently Asked Questions about git-workflow

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

FAQPage Schema

What is the best Git branching strategy for managing releases and collaboration?▼

Effective Git workflows rely on standardized branching strategies like GitHub Flow, trunk-based development, or GitFlow to define clear guidelines for branch creation, merging, and releasing.

How do I resolve Git merge conflicts during pull requests?▼

Resolve Git merge conflicts during pull requests by following standardized conflict resolution guidance and clear PR workflows that reduce integration risk and improve code review traceability.

When should I use Git merge vs rebase to integrate branches?▼

Use Git merge to preserve complete branch history and rebase to create a linear project timeline, with specific guidance depending on your team's selected workflow pattern and integration risk tolerance.

How to write consistent Git commit messages for better code reviews?▼

Write consistent Git commit messages by applying standardized commit conventions and structured PR descriptions, which directly improve code review quality and historical traceability for the team.

Does this Git workflow guidance work for teams adopting trunk-based development?▼

Yes, this guidance supports teams adopting trunk-based development, alongside GitHub Flow and GitFlow, by aligning branch naming, PR processes, and release gates to the selected pattern.

Why do inconsistent Git workflows slow down deployments?▼

Inconsistent Git workflows slow deployments by creating conflicting conventions and integration bottlenecks, which are resolved by standardizing branching strategies, commit conventions, and release planning.