git-workflow

Standardize git commits, rebasing, conflict resolution, and branch management.

14|4|Updated Oct 20, 2025

Search Tags:#git #version control #workflow automation #commits #branch management #rebase #conflict resolution

Ready to run

npx skills add https://github.com/motlin/claude-code-plugins --skill git-workflow-motlin

💬 Prompt for ChatGPT / Claude Chat▼

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

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Complex Git operations like conflict resolution, rebasing, and worktree management can be time-consuming, error-prone, and a source of developer frustration. This Skill provides clear guidance and commands to automate and simplify these tasks.

Core Features & Use Cases

Smart Commits: Guides on using /git:commit and git:commit-handler for efficient commit creation.
Conflict Resolution: Provides commands like /git:conflicts and git:conflict-resolver to streamline conflict resolution.
Branch Management: Offers commands for rebasing all branches (/git:rebase-all) and managing worktrees (/git:worktree, /git:clean-worktrees).
Use Case: When facing a complex Git rebase, resolving multiple conflicts, or needing to manage several worktrees, use this skill to get precise instructions and commands, reducing manual effort and potential mistakes.

Quick Start

Help me resolve the current Git conflicts in my repository.

Frequently Asked Questions about git-workflow

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

FAQPage Schema

How do I resolve merge conflicts in Git?▼

Git conflict resolution involves identifying conflicting changes, selecting which version to keep, and completing the merge or rebase. This Skill provides commands like `/git:conflicts` and `git:conflict-resolver` to streamline the process and reduce manual errors across your repository.

What's the best way to rebase branches in Git?▼

Rebasing rewrites commit history to create a linear timeline, useful for cleaning up before merging. This Skill offers `/git:rebase-all` to rebase multiple branches and delegates to `git:rebaser` for standardized, error-resistant rebasing across your workflow.

How do I automate Git commits with standardized messages?▼

Standardized commits enforce consistent messaging and metadata across team repositories. This Skill guides `/git:commit` and `git:commit-handler` to automate commit creation with enforced conventions, reducing formatting errors and improving repository history clarity.

Can I manage multiple Git worktrees efficiently?▼

Git worktrees allow parallel work on multiple branches without switching context. This Skill provides `/git:worktree` and `/git:clean-worktrees` commands to create, organize, and clean up worktrees, simplifying branch lifecycle management across your development environment.

Does this Skill work for team-based and individual development?▼

Yes. This Skill standardizes Git workflow operations—commits, rebasing, conflict resolution, and branch management—across both team and individual contexts, applying consistently whether you work in shared repositories or solo projects.

Why should I use workflow automation for Git operations?▼

Manual Git operations like conflict resolution, rebasing, and worktree management are error-prone and time-consuming. Workflow automation reduces developer frustration, enforces consistency across CI pipelines and repositories, and delegates complex tasks to specialized handlers.