git-wizard

Guide complex Git workflows including merges, rebases, and conflict resolution.

Updated Mar 19, 2026
One-click install
npx skills add https://github.com/Liz2Z/oh-my-skills --skill git-wizard
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-wizard
Source: https://github.com/Liz2Z/oh-my-skills/tree/main/skills/git-wizard
Command: npx skills add https://github.com/Liz2Z/oh-my-skills --skill git-wizard

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Git experts often struggle with complex workflows, conflicts, and history rewrites across large projects; this skill provides structured guidance to navigate branching, merging, rebasing, and recovery tasks safely.

Core Features & Use Cases

  • Branch management and workflow orchestration
  • Advanced operations (cherry-pick, bisect, reflog)
  • Conflict resolution and history safety
  • Guided, safe execution for destructive actions

Quick Start

Describe your Git scenario and I will guide you step-by-step through the workflow.

Frequently Asked Questions about git-wizard

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

FAQPage Schema
How do I resolve complex Git merge conflicts in large repositories?

Git conflict resolution for complex merges is guided step-by-step through structured workflows, applying advanced operations like cherry-pick and reflog to navigate branching and merging safely across large projects.

What is the best way to safely rewrite Git history without losing commits?

Git history rewrites require safety notes for destructive actions; this skill provides structured guidance to execute rebasing and history recovery tasks safely, preventing accidental commit loss during complex version-control operations.

How do I recover lost commits using Git reflog and bisect?

Git reflog and bisect are advanced commands supported for recovery scenarios, allowing you to trace lost commits and isolate regressions step-by-step through structured workflow guidance across diverse repositories.

When do I need to use Git cherry-pick during branch management?

Git cherry-pick is needed during branch management when applying specific commits from one branch to another, orchestrating complex workflows safely with structured guidance for conflict resolution and history preservation.

Can I use this to guide destructive Git operations across diverse repositories?

Destructive Git operations across diverse repositories are supported with explicit safety notes, providing guided execution for history rewrites and conflict resolution to prevent critical data loss during version-control tasks.

Why does Git rebasing create conflicts and how can I navigate them?

Git rebasing creates conflicts when rewritten commits overlap with existing changes; this skill resolves them by providing structured guidance for conflict resolution and safe workflow execution during complex branching scenarios.