git-workflow

motlin's avatarfrom motlin

Git workflow best practices for commits, rebasing, conflict resolution, and branch management. Use when working with git operations, creating commits, resolving conflicts, or managing branches.

⭐0stars🔀1forks📁View on GitHub🕐Updated Dec 22, 2025

When & Why to Use This Skill

This Claude skill automates and standardizes Git workflows by implementing industry best practices for commits, rebasing, and conflict resolution. It enhances repository integrity and developer productivity by delegating complex version control operations to specialized agents, ensuring a clean, professional project history and reducing the risk of manual errors during branch management.

Use Cases

  • Standardized Commit Handling: Automatically generate and format commit messages using the commit-handler agent to maintain a consistent and searchable repository history.
  • Automated Conflict Resolution: Efficiently resolve complex merge or rebase conflicts by delegating to the conflict-resolver agent, minimizing downtime during integration.
  • Seamless Branch Rebasing: Keep feature branches synchronized with upstream changes through automated rebasing, ensuring a linear and clean git graph without manual intervention.
  • Workflow Enforcement: Implement strict git best practices across a team by routing all version control operations through specialized agents to prevent common mistakes.
namegit-workflow
descriptionGit workflow best practices for commits, rebasing, conflict resolution, and branch management. Use when working with git operations, creating commits, resolving conflicts, or managing branches.

Git Workflow Best Practices

This skill provides guidelines for git operations including commits, conflict resolution, and branch management.

Commit Guidelines

ALWAYS delegate to the git:commit-handler agent for all commit operations. Never run git commit directly.

Conflict Resolution

ALWAYS delegate to the git:conflict-resolver agent to resolve any git merge or rebase conflicts.

Rebasing

ALWAYS delegate to the git:rebaser agent to rebase the current branch on upstream.