skills.rest
ibytechaos
ibytechaosCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow

Guides Git branching strategies, commit conventions, and collaborative development workflows.

1|Updated Oct 11, 2025
Search Tags:#git#version control#branching#pull requests#merge conflicts#commit conventions#gitflow
One-click install
npx skills add https://github.com/ibytechaos/claude --skill git-workflow-ibytechaos
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/ibytechaos/claude/tree/main/plugins/everything-claude-code/skills/git-workflow
Command: npx skills add https://github.com/ibytechaos/claude --skill git-workflow-ibytechaos

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Teams struggle with inconsistent branching strategies, unclear commit messages, merge conflicts, and disorganized release processes. This Skill provides structured Git workflow guidance covering branching models, commit conventions, PR practices, and conflict resolution. ## Core Features & Use Cases - Branching Strategy Selection: Compares GitHub Flow, Trunk-Based Development, and GitFlow with decision criteria based on team size and release cadence. - Commit & PR Standards: Enforces Conventional Commits format, PR description templates, and code review checklists. - Conflict Resolution & Releases: Provides merge vs rebase guidance, conflict resolution commands, semantic versioning, and changelog generation. - Use Case: A team lead setting up a new repository can use this Skill to choose GitHub Flow, configure commit message templates, define branch naming conventions, and establish PR review checklists for the team. ## Quick Start Help me set up a Git workflow for my team using the git-workflow skill, including a branching strategy and commit message conventions.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I choose between GitFlow and GitHub Flow?▼

GitHub Flow suits continuous deployment and small-to-medium teams with a single protected main branch. GitFlow fits scheduled releases and enterprise projects needing separate develop, release, and hotfix branches. Trunk-Based Development works for high-velocity teams with feature flags.

When should I use git rebase vs git merge?▼

Use merge when integrating feature branches into main to preserve exact history, especially for shared branches. Use rebase to update a local-only feature branch with the latest main for a linear history. Never rebase branches others have based work on.

How do I write good commit messages with Conventional Commits?▼

Use the format type(scope): subject, where type is feat, fix, docs, refactor, test, chore, perf, ci, or revert. Keep the subject in imperative mood under 50 characters, and use the body to explain why the change was made.

How do I resolve Git merge conflicts?▼

Run git status to see conflicted files, then edit the conflict markers manually, use git mergetool, or accept one side with git checkout --ours or --theirs. After resolving, stage the files with git add and commit the result.

When should I not use git rebase?▼

Never rebase branches that have been pushed to a shared repository, that others have based work on, or that are protected like main and develop. Rebase rewrites history, which breaks collaborators' work. Use git revert for public branches instead.

Related Skills

Explore More Software Engineering Skills→
pradeepmoulipradeepmouli
2

speckit-git-initialize

Initialize a Git repository with configurable branch and .gitignore settings.

Community
Intermediate
beekeeper-labbeekeeper-lab
1

Deploy

Promote a test branch to main via pull request after tests and lint pass.

Community
Advanced
promptfoopromptfoo
24.7k

code-review

Reviews code for bugs, security vulnerabilities, and best practice violations.

Official
Basic
ancolemanancoleman
503

managing-git-workflows

Configure Git branching strategies, Conventional Commits, and Git hooks.

Community
Advanced