How do I undo my last commit without losing my changes?

The skill recommends using the 'git reset --soft HEAD~1' command, which removes the commit but keeps all your modifications staged and ready for a new attempt.

Can I use this to resolve merge conflicts?

Absolutely. It provides a structured process to identify conflict markers, choose the correct code, and finalize the resolution safely.

Can this skill help me if I am in a 'detached HEAD' state?

Yes, the Git Helper provides clear instructions to return to your main branch or safely save your current work to a new branch.

Does it support GitHub-specific workflows?

Yes, it includes guidance for cloning repositories, adding remotes, and pushing local projects to GitHub for the first time.

Git Helper

Name: Git Helper
Author: I-Onlabs

byI-Onlabs

•

開発者ツール

Simplifies version control workflows by translating complex Git commands into intuitive actions for saving, undoing, and collaborating on code.

The Git Helper skill transforms Claude into a version control expert, specifically designed for developers who need a straightforward, human-centric bridge to Git's complexity. It provides immediate, actionable commands for daily tasks such as saving checkpoints, recovering from mistakes, managing feature branches, and resolving merge conflicts. Whether you are trying to undo a messy commit, recover a deleted file, or synchronize with a remote repository, this skill offers guided assistance to maintain repository health without requiring deep memorization of obscure CLI flags.

主な機能

01Step-by-step recovery guides for accidental deletions and broken states

02Streamlined branch management and remote synchronization workflows

03Guided merge conflict resolution and stash management

04Quick-reference cheat sheets for daily development habits

05Simplified command translation for common version control tasks

062 GitHub stars

ユースケース

01Resolving complex merge conflicts during team collaboration

02Safely creating and pushing feature branches to remote repositories

03Recovering work after an accidental deletion or an incorrect commit

主な機能

01Step-by-step recovery guides for accidental deletions and broken states

02Streamlined branch management and remote synchronization workflows

03Guided merge conflict resolution and stash management

04Quick-reference cheat sheets for daily development habits

05Simplified command translation for common version control tasks

062 GitHub stars

ユースケース

01Resolving complex merge conflicts during team collaboration

02Safely creating and pushing feature branches to remote repositories

03Recovering work after an accidental deletion or an incorrect commit