Git Recovery and Fix

概要

This skill serves as a comprehensive guide for developers navigating Git emergencies, offering clear diagnostic steps and recovery strategies for missing work. It leverages the power of the Git reflog to track down orphaned commits and provides detailed workflows for merging, cherry-picking, or resetting to restore repository integrity. By incorporating conflict resolution best practices and safety measures like recovery branches, it ensures that users can confidently undo mistakes and avoid common pitfalls like garbage collection or incomplete merges.

主な機能

• Systematic diagnostic routines using git reflog to locate orphaned commits
• 16 GitHub stars
• Verification checklists to ensure successful recovery and file integrity
• Detailed conflict resolution guidance for handling complex merge scenarios
• Step-by-step recovery strategies including merging, cherry-picking, and resetting
• Safety protocols for creating recovery branches to prevent further data loss

ユースケース

• Recovering work lost during a detached HEAD state or accidental reset
• Restoring missing commits after switching branches without saving changes
• Investigating and fixing repository issues where changes appear to have vanished