git-workflow

Guide git branch creation, commits, merges, and conflict resolution.

Updated Feb 28, 2026

Search Tags:#git #workflow #branching #version-control #commit-history #conflicts #merges

Ready to run

npx skills add https://github.com/dsivov/ai_development_team --skill git-workflow-dsivov

💬 Prompt for ChatGPT / Claude Chat▼

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

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Integrator tasks often suffer from inconsistent branch lifecycles, scattered commit messages, and merge conflicts. This skill provides a structured, repeatable Git workflow to guide branch creation, commit practices, merging, and conflict resolution, reducing integration friction and back-and-forth debugging.

Core Features & Use Cases

Branch naming and lifecycle guidance to keep feature work organized and traceable.
Commit guidance to ensure atomic, descriptive messages that reference task identifiers.
Merge conflict resolution steps and pre-merge checks to ensure safe integrations and maintainable history.
General best practices for maintaining a clean, auditable git history across development and integration phases.

Quick Start

Create a new feature branch from development and follow the lifecycle steps from creation to merge.

Frequently Asked Questions about git-workflow

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

FAQPage Schema

How do I resolve git merge conflicts during feature branch integration?▼

Git merge conflict resolution involves following structured steps and pre-merge checks to ensure safe integrations. This approach enforces non-broken changes and pre-merge validation to maintain a clean, auditable history.

What is the best way to maintain a clean git commit history in collaborative development?▼

Maintaining a clean git commit history requires enforcing atomic commits and descriptive messages that reference task identifiers. This ensures reliable integration and keeps feature work organized and traceable across development phases.

How do I create a new feature branch with proper naming and lifecycle guidance?▼

Creating a new feature branch requires following branch naming and lifecycle guidance from creation to merge. This keeps feature work organized, traceable, and reduces integration friction in collaborative environments.

Can I use this git workflow for both everyday feature work and merge handling?▼

Yes, this git workflow applies to everyday feature work, merge handling, conflict resolution, and history maintenance. It provides a structured, repeatable process to reduce integration friction and back-and-forth debugging.

Why should I enforce atomic commits and pre-merge validation in git?▼

Enforcing atomic commits and pre-merge validation in git ensures reliable integration and non-broken changes. This practice maintains an auditable git history and reduces integration friction during collaborative development.