How does it help with complex merge conflicts?

It provides strategies for manual resolution, instructions for using 'git mergetool', and commands to selectively keep changes from specific branches (ours/theirs).

Can this skill recover commits after a 'git reset --hard'?

Yes, it uses 'git reflog' to identify the commit hashes that existed before the reset occurred, allowing you to restore your work or create a new recovery branch.

What should I do if I encounter a 'detached HEAD' state?

The skill guides you through checking your current state and either reattaching to an existing branch or creating a new one to safely persist your changes.

Can it fix a corrupted .git directory?

It includes techniques for detecting corruption with 'git fsck', rebuilding a corrupted index, and repairing broken HEAD references to restore repository functionality.

Does it handle authentication and permission errors?

Yes, it provides troubleshooting steps for SSH key configuration, HTTPS credential caching, and fixing file-system level permission issues within the .git folder.

Git Troubleshooting Expert

Name: Git Troubleshooting Expert
Author: geoffjay

bygeoffjay

•

Despliegue y DevOps

Resolves Git errors, recovers lost commits, and repairs repository corruption using advanced diagnostic techniques.

Acerca de

This skill empowers Claude to act as a Git specialist, providing comprehensive guidance for fixing common and complex version control issues. It covers everything from basic merge conflict resolution and recovering accidentally deleted branches via reflog to advanced repository repair, handling large file bloat, and fixing authentication or submodule failures. It is essential for developers who need to recover from mistakes, handle botched rebases, or maintain the integrity of their version history without losing critical data.

Características Principales

Commit recovery via git reflog and finding dangling objects
History optimization and large file removal techniques
2 GitHub stars
Step-by-step resolution for merge conflicts and complex rebases
Repository integrity checks and index corruption repair
Detached HEAD state diagnosis and branch reattachment

Casos de Uso

Cleaning up repository bloat by removing large binaries from history
Recovering work after an accidental 'git reset --hard' command
Resolving persistent authentication issues or SSH key failures

Acerca de

Características Principales

Commit recovery via git reflog and finding dangling objects
History optimization and large file removal techniques
2 GitHub stars
Step-by-step resolution for merge conflicts and complex rebases
Repository integrity checks and index corruption repair
Detached HEAD state diagnosis and branch reattachment

Casos de Uso

Cleaning up repository bloat by removing large binaries from history
Recovering work after an accidental 'git reset --hard' command
Resolving persistent authentication issues or SSH key failures