Skill

git-workflow

Guides Git workflows with branching strategies (GitHub Flow, Git Flow), conventional commit messages, branch naming, PR templates, and operations like rebase. Use for Git ops, commits, branches, team workflows.

Git

Github

git-workflow

npx claudepluginhub roboco-io/plugins --plugin workflow

Tool Access

This skill uses the workspace's default tool permissions.

Preview

You are an expert in Git version control and team collaboration workflows.

SKILL.md

Similar Skills

managing-git

1.4k

Manages Git workflows: branching strategies (GitHub Flow, Git Flow), conventional commits, branch naming, PR checklists, and feature development processes. Use for commits, PRs, branches, conflicts, version control.

project-starter

git-workflow

179.0k

Provides Git workflow guidance on branching strategies (GitHub Flow, Trunk-Based, GitFlow), conventional commits, merge vs rebase, conflict resolution, and team best practices. Activate for project setup, PRs, releases, onboarding.

ecc

git-operations

Guides Git operations with conventional commits, PR workflows, squash merges, branch management, and conflict resolution. Useful for version control tasks like commits, branches, and pull requests.

3 files

all-skills

Stats

Parent Repo Stars7

Parent Repo Forks4

Last CommitJan 17, 2026

Actions

View Source View Plugin View on GitHub View README

Help us improve

Share bugs, ideas, or general feedback.

Git Workflow Skill

You are an expert in Git version control and team collaboration workflows.

Commit Message Convention

Format

<type>(<scope>): <subject>

<body>

<footer>

Types

Type	Description
feat	New feature
fix	Bug fix
docs	Documentation only
style	Code style (formatting, semicolons)
refactor	Code change that neither fixes nor adds
perf	Performance improvement
test	Adding or updating tests
chore	Build process or auxiliary tools
ci	CI configuration changes

Examples

feat(auth): add OAuth2 login support

Implement Google and GitHub OAuth2 providers.
Users can now link multiple social accounts.

Closes #123

fix(api): handle null response from payment service

The payment service returns null for cancelled transactions.
Added null check to prevent TypeError.

Fixes #456

Branching Strategies

GitHub Flow (Recommended for most teams)

main (production-ready)
  └── feature/add-login
  └── feature/update-dashboard
  └── fix/payment-bug

Rules:

main is always deployable
Create feature branches from main
Open PR when ready for review
Merge to main after approval
Deploy immediately after merge

Git Flow (For scheduled releases)

main (production)
develop (integration)
  └── feature/add-login
  └── release/v1.2.0
  └── hotfix/critical-bug

Rules:

main reflects production
develop is integration branch
Feature branches from develop
Release branches for final prep
Hotfix branches from main

Branch Naming Convention

<type>/<ticket>-<description>

Examples:
feature/AUTH-123-oauth-login
fix/BUG-456-null-pointer
chore/INFRA-789-update-deps

Pull Request Guidelines

PR Title

Follow commit message format:

feat(auth): add OAuth2 login support

PR Description Template

## Summary
Brief description of changes

## Changes
- Change 1
- Change 2

## Testing
- [ ] Unit tests pass
- [ ] Integration tests pass
- [ ] Manual testing completed

## Screenshots (if applicable)

## Related Issues
Closes #123

Review Checklist

Code follows project conventions
Tests are included and passing
Documentation is updated
No sensitive data exposed
Breaking changes are documented

Common Operations

Rebase vs Merge

Use Rebase:

Updating feature branch with main
Cleaning up local commits before PR
Linear history preferred

Use Merge:

Merging PR to main
Preserving branch history
Team policy requires merge commits

Interactive Rebase

# Squash last 3 commits
git rebase -i HEAD~3

# Rebase onto main
git rebase -i main

Undo Operations

# Undo last commit (keep changes)
git reset --soft HEAD~1

# Undo last commit (discard changes)
git reset --hard HEAD~1

# Revert a pushed commit
git revert <commit-hash>

Best Practices

Commit Often, Push Regularly
- Small, atomic commits
- Push at least daily
Write Meaningful Messages
- Explain why, not just what
- Reference issues/tickets
Keep Branches Short-lived
- Merge within days, not weeks
- Delete branches after merge
Review Before Merging
- At least one approval required
- CI checks must pass