When does this git skill activate?

It activates automatically when you mention complex git tasks like rebasing, resolving conflicts, cherry-picking, history cleanup, or using git bisect.

Can I recover lost code or deleted commits with this skill?

Yes, the skill includes 'Repository Archaeology' capabilities that utilize git reflog to identify and restore previous states even after complex or destructive operations.

Is it safe to perform a rebase using this AI skill?

Yes, the skill includes built-in safety rules, such as preventing rebases on shared branches and using --force-with-lease instead of --force to avoid overwriting others' work.

How does this skill handle lock file conflicts?

The skill follows a safety-first protocol: it never merges lock files manually. Instead, it checks out the incoming version and regenerates the file using the native package manager to ensure a valid state.

Advanced Git Operations

Name: Advanced Git Operations
Author: hyperb1iss

byhyperb1iss

•

開発者ツール

Streamlines complex version control workflows including rebase management, conflict resolution, and repository archaeology.

This skill empowers Claude with sophisticated git capabilities designed for professional development environments. It provides structured decision trees for resolving complex merge conflicts, specialized logic for handling lock files, and strategies for maintaining a clean commit history. By automating advanced tasks like git bisect for bug hunting and interactive rebasing for PR preparation, it ensures version control best practices are followed while minimizing the risk of data loss through safety-fist operations like automatic branch backups and force-with-lease enforcement.

主な機能

01Automated conflict resolution for lock files (npm, pnpm, Cargo) and SOPS files

021 GitHub stars

03Advanced repository archaeology using git bisect, blame, and reflog

04Strategic decision trees for determining rebase vs. merge scenarios

05Interactive rebase and squash workflows for professional commit hygiene

06Safety-first execution with automated branch backups and force-with-lease

ユースケース

01Cleaning up and squashing messy feature branch histories before merging to the main branch

02Resolving complex merge conflicts in package manager lock files without manual errors

03Locating the source of a regression using automated binary search with git bisect

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add hyperb1iss/hyperskills git

For use in Claude.ai and ChatGPT

Download Skill