git-troubleshooter

Diagnose and resolve Git merge conflicts, accidental changes, and history issues.

1|Updated Feb 5, 2026

Search Tags:#git #troubleshooting #reflog #branch-management #merge-conflicts #commit-recovery #remote-repositories

Ready to run

npx skills add https://github.com/tygwan/ultra-codex-init --skill git-troubleshooter

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: git-troubleshooter
Source: https://github.com/tygwan/ultra-codex-init/tree/main/.codex/skills/git-troubleshooter
Command: npx skills add https://github.com/tygwan/ultra-codex-init --skill git-troubleshooter

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Git problems such as merge conflicts, accidental changes, and history manipulation can derail development and require careful, repeatable fixes.

Core Features & Use Cases

Diagnose and resolve merge conflicts, revert unintended commits, and repair damaged histories across typical feature branches.
Guide safe undo/redo operations, branch hygiene, and remote push troubleshooting to keep the repository healthy.
Provide repeatable, safe workflows with clear diagnostics and fallback options for non-destructive fixes.

Quick Start

Initiate a guided Git troubleshooting workflow to resolve the issue without data loss.

Frequently Asked Questions about git-troubleshooter

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

FAQPage Schema

How do I resolve Git merge conflicts without losing changes?▼

To resolve Git merge conflicts without losing data, diagnose the conflicting branches and apply guided step-by-step resolution commands. This ensures non-destructive fixes by providing clear safety guidelines and recoverable fallbacks for your feature branches.

How does Git reflog work for recovering deleted commits?▼

Git reflog tracks reference updates, allowing you to diagnose and restore damaged histories by locating lost commit hashes. This enables safe history restoration and undoing unintended changes across your repository without permanently discarding work.

What is the best way to undo accidental changes in a remote repository?▼

The best way to undo accidental changes in a remote repository is using safe undo and redo operations with step-by-step commands. This approach repairs pushed history while maintaining branch safety and providing fallback options for non-destructive fixes.

Can I restore a damaged Git branch history after a failed rebase?▼

Yes, you can restore damaged Git branch history after a failed rebase by diagnosing the repository state and applying history restoration commands. This provides repeatable workflows to repair damaged histories and recover lost commits safely.

Why does my Git push to remote repositories fail after resolving conflicts?▼

Git push failures after resolving conflicts often require remote push troubleshooting to diagnose branch safety and synchronization issues. Applying guided step-by-step commands ensures your repository remains healthy and your local changes sync correctly.

When should I not use hard reset to undo Git changes?▼

You should not use a hard reset to undo Git changes when working with uncommitted work, as it bypasses safety guidelines. Instead, use non-destructive fix workflows with recoverable fallbacks to ensure branch hygiene and prevent permanent data loss.