git-expert

Resolve Git conflicts and branching issues with reversible step-by-step guidance.

Updated Dec 22, 2025

Search Tags:#git #workflow #branching #recovery #version-control #conflicts #rebasing

Ready to run

npx skills add https://github.com/0xkynz/codekit --skill git-expert-0xkynz

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: git-expert
Source: https://github.com/0xkynz/codekit/tree/main/templates/skills/git-expert
Command: npx skills add https://github.com/0xkynz/codekit --skill git-expert-0xkynz

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Git workflows are error-prone and hard to standardize across teams; this Skill provides guided, safe, and reversible Git strategies for conflicts, branching, and history management.

Core Features & Use Cases

Merge-conflict resolution with three-way awareness and safe handoffs
Branching strategy guidance (GitFlow, GitHub Flow, trunk-based development)
History management and recovery operations (interactive rebase, reflog, and recoveries)

Quick Start

Describe your current Git state and request a safe, reversible plan to resolve conflicts.

Frequently Asked Questions about git-expert

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

FAQPage Schema

How do I resolve git merge conflicts safely without losing changes?▼

Resolve git merge conflicts using three-way awareness and safe handoffs to ensure no changes are lost. This approach provides step-by-step instructions and traceable reversions for predictable conflict resolution outcomes.

What is the best way to rewrite git history with an interactive rebase?▼

Rewrite git history through interactive rebase with safe, reversible guidance and safety checks. This method ensures clean histories and recoverable operations across your repositories using reflog for traceable reversions.

How do I choose a branching strategy for my team workflow?▼

Choose a branching strategy by evaluating GitFlow, GitHub Flow, and trunk-based development. This guidance applies to team workflows requiring sustainable merge strategies and clean histories across individual projects.

Can I recover lost commits after a bad git reset or rebase?▼

Recover lost commits after a bad git reset or rebase using reflog and history management operations. This provides safe, reversible recovery with step-by-step instructions and safety checks for predictable outcomes.

When should I not use git rebase to manage branch conflicts?▼

You should not use git rebase when working with shared branch histories where traceable reversions are required. Instead, use safe merge strategies to ensure predictable outcomes and avoid history rewrite complications.