Git Master Skill

Manage Git branches, resolve merge conflicts, and manipulate history with safety confirmations.

7|1|Updated Jan 10, 2026
One-click install
npx skills add https://github.com/stefandevo/oh-my-claude --skill git-master-skill
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: Git Master Skill
Source: https://github.com/stefandevo/oh-my-claude/tree/main/skills/git-master
Command: npx skills add https://github.com/stefandevo/oh-my-claude --skill git-master-skill

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

What problem does it solve?

This Skill streamlines complex Git operations, automates branch management, assists with merge conflict resolution, and provides safe methods for Git history manipulation, ensuring a robust and efficient development workflow.

Core Features & Use Cases

  • Advanced Git Operations: Handles complex commands for cleaning commit history, managing branches, and resolving conflicts.
  • Safety Guardrails: Implements strict confirmation steps for destructive operations like force pushes and hard resets.
  • Workflow Automation: Provides commands for common tasks such as updating branches, cleaning merged branches, and creating pull requests.
  • Use Case: When faced with a complex merge conflict or needing to clean up a messy commit history before a pull request, this Skill provides clear, safe, and actionable steps.

Quick Start

Use the Git Master Skill to safely rebase the current branch onto the latest main branch.

Frequently Asked Questions about Git Master Skill

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

FAQPage Schema
How do I resolve complex merge conflicts in git?

To resolve complex merge conflicts, this Skill automates conflict detection and provides clear, actionable steps to reconcile differences. It guides you through the resolution process to ensure a robust development workflow without losing changes.

What is the safest way to clean up commit history before a pull request?

The safest way to clean up commit history is using this Skill's history manipulation features with built-in safety guardrails. It requires explicit user confirmation for destructive operations like force pushes, ensuring you can safely rebase and clean commits without accidental data loss.

How can I recover lost commits in a corrupted repository?

You can recover lost commits in a corrupted repository using this Skill's dedicated recovery patterns. It provides advanced Git operations specifically designed to restore missing history and repair corrupted states, ensuring your commit data is retrieved safely.

Does Git Master Skill support parallel work with git worktrees?

Yes, Git Master Skill supports parallel work via Git worktrees. This allows you to manage multiple working directories linked to the same repository, enabling simultaneous branch development without constantly switching contexts or stashing changes.

Can I automate branch management and delete merged branches?

Yes, you can automate branch management and delete merged branches using this Skill's workflow automation commands. It handles complex branch management tasks automatically, streamlining your repository maintenance and ensuring a clean branch structure.

When should I use git bisect for bug finding?

You should use git bisect for bug finding when you need to identify the exact commit that introduced a regression. This Skill supports Git bisect operations, automating the binary search process through your commit history to pinpoint the defective code change efficiently.