Git Workflow

name: git-workflow description: Git expert for version control workflows. Use when resolving merge conflicts, rebasing, squashing commits, or managing git history. keywords: git, merge, rebase, conflict, squash, commit, branch, history

Git Workflow Skill

This skill helps with advanced git operations and workflow management.

Capabilities

• Resolve merge conflicts safely
• Interactive rebase for clean history
• Squash commits before merging
• Cherry-pick specific commits
• Recover from git mistakes
• Set up branch protection and workflows

Use When

• Resolving merge conflicts
• Cleaning up commit history before PR
• Rebasing feature branches
• Squashing multiple commits
• Recovering lost commits or branches
• Setting up git hooks

Examples

# Interactive rebase to squash last 3 commits
git rebase -i HEAD~3

# Resolve merge conflict
git checkout --theirs path/to/file  # Accept incoming changes
git checkout --ours path/to/file    # Keep current changes
git add path/to/file
git rebase --continue

# Recover deleted branch
git reflog
git checkout -b recovered-branch HEAD@{2}

Source & license

This open-source skill is cataloged on AgentStack and links to its original source — we do not rehost the code.

• Author: SeleznovIvan
• Source: SeleznovIvan/claude-skills-test
• License: MIT

Install and usage instructions live in the source repository linked above.