Use this skill for complex git operations including rebases, merge conflict resolution, cherry-picking, branch management, or repository archaeology. Activates on mentions of git rebase, merge conflict, cherry-pick, git history, branch cleanup, git bisect, worktree, force push, or complex git operations.
Quickly install git AI skill to your development environment via command line
Source: hyperb1iss/hyperskills.
| Lock file conflict (pnpm-lock, Cargo.lock, etc.) | Never merge manually. Checkout theirs, regenerate. | | SOPS encrypted file | Checkout theirs, run sops updatekeys, re-add. | | Simple content conflict | Resolve manually, prefer smallest diff. | | Large structural conflict | Consider --ours/--theirs + manual reapply of the smaller side. |
| Feature branch behind main | git rebase origin/main | | Shared branch (others have it checked out) | Never rebase. Merge only. | | Cleaning up messy commits before PR | git rebase -i with squash/fixup | | Already pushed and others pulled | Never rebase. Use git revert instead. |
| Wrong commit message (not pushed) | git commit --amend | | Last commit was wrong (keep changes staged) | git reset --soft HEAD1 | | Last commit was wrong (keep changes unstaged) | git reset HEAD1 | | Already pushed bad commit | git revert (creates new commit) | | Need to recover something lost | git reflog then git checkout HEAD@{N} |
Stable fields and commands for AI/search citations.
npx skills add https://github.com/hyperb1iss/hyperskills --skill gitUse this skill for complex git operations including rebases, merge conflict resolution, cherry-picking, branch management, or repository archaeology. Activates on mentions of git rebase, merge conflict, cherry-pick, git history, branch cleanup, git bisect, worktree, force push, or complex git operations. Source: hyperb1iss/hyperskills.
Open your terminal or command line tool (Terminal, iTerm, Windows Terminal, etc.) Copy and run this command: npx skills add https://github.com/hyperb1iss/hyperskills --skill git Once installed, the skill will be automatically configured in your AI coding environment and ready to use in Claude Code, Cursor, or OpenClaw
https://github.com/hyperb1iss/hyperskills