What should I do if my Git repository is corrupted?

This skill includes diagnostic procedures using git fsck to detect integrity issues and repair steps for corrupted objects, indices, or pack files.

How does it handle complex merge conflicts?

The skill provides guidance on reading conflict markers, using git mergetool, and executing three-way diffs to resolve differences between local and incoming changes.

Is it safe to use for undoing public commits?

The skill prioritizes safe workflows, recommending git revert for public history to avoid disrupting team members, while reserving git reset for local-only changes.

Can it help with detached HEAD states?

Absolutely. It explains why a HEAD becomes detached and provides multiple options to reattach it to a branch or preserve commits made while in that state.

Can this skill help me if I accidentally deleted a branch?

Yes, it provides specific commands using git reflog to locate the last known commit hash of the deleted branch and recreate it instantly.

Git Troubleshooting

Name: Git Troubleshooting
Author: geoffjay

bygeoffjay

•

Developer Tools

Diagnoses and resolves Git repository errors, recovers lost commits, and fixes complex version control issues.

About

The Git Troubleshooting skill provides comprehensive guidance for developers facing version control disasters, ranging from simple merge conflicts to critical repository corruption. It empowers Claude to identify specific error states like detached HEADs or failed rebases and provides precise, step-by-step recovery commands using tools like reflog and fsck. Whether you have accidentally performed a hard reset, need to prune large files from history, or are struggling with SSH authentication, this skill ensures repository integrity and minimizes data loss during development workflows.

Key Features

Advanced merge conflict resolution strategies and three-way diff tools
Comprehensive recovery procedures for botched rebases and force-push accidents
2 GitHub stars
Lost commit and branch recovery using git reflog and dangling object analysis
Repository health diagnostics and repair for corrupted index or pack files
Troubleshooting for SSH/HTTPS authentication and submodule synchronization

Use Cases

Identifying and removing large binary files from the repository history
Resolving complex merge conflicts and returning from a detached HEAD state
Recovering work after an accidental git reset --hard or branch deletion

About

Key Features

Advanced merge conflict resolution strategies and three-way diff tools
Comprehensive recovery procedures for botched rebases and force-push accidents
2 GitHub stars
Lost commit and branch recovery using git reflog and dangling object analysis
Repository health diagnostics and repair for corrupted index or pack files
Troubleshooting for SSH/HTTPS authentication and submodule synchronization

Use Cases

Identifying and removing large binary files from the repository history
Resolving complex merge conflicts and returning from a detached HEAD state
Recovering work after an accidental git reset --hard or branch deletion