Can this skill help me recover deleted branches?

Yes, it provides specific guidance on using the Git Reflog to identify and restore deleted branches or commits, acting as a safety net for almost any Git mistake.

Does this skill assist with merge conflicts?

Yes, it includes strategies for advanced conflict resolution that occur during complex rebases and cherry-picking operations, ensuring your history remains clean.

What are the benefits of using Git Worktrees?

Worktrees allow you to have multiple branches of the same repository checked out in different directories simultaneously, which is perfect for working on long-running features while handling urgent bug fixes.

How does Git Bisect automation work?

This skill demonstrates how to use 'git bisect run' with a test script to automatically perform a binary search through your history to find the exact commit that broke your code.

Is it safe to use rebasing on public branches?

The skill teaches best practices that advise against rebasing public branches to avoid history conflicts for collaborators, while explaining how to use --force-with-lease safely.

Advanced Git Workflows

Name: Advanced Git Workflows
Author: HermeticOrmus

byHermeticOrmus

•

開発者ツール

Optimizes repository management through interactive rebasing, automated bug discovery, and complex history recovery techniques.

概要

This skill empowers Claude to execute sophisticated version control operations, allowing developers to maintain a pristine commit history and navigate complex repository states with confidence. It provides specialized guidance for interactive rebasing to clean up feature branches, cherry-picking specific commits across releases, and utilizing Git Bisect for rapid debugging. By leveraging advanced tools like Git Worktrees for multi-tasking and the Reflog for data recovery, this skill ensures a professional, linear history while providing a robust safety net for correcting version control mistakes.

主な機能

Concurrent branch management with Git Worktrees
2 GitHub stars
Automated regression testing using Git Bisect binary search
Selective commit application via advanced cherry-picking
Interactive rebase for commit squashing and history cleanup
Emergency history recovery using the Git Reflog

ユースケース

Switching to urgent hotfixes without stashing or committing unfinished work using Worktrees.
Preparing clean, production-ready Pull Requests by squashing and reordering local commits.
Rapidly identifying the specific commit that introduced a regression in large codebases.

概要

主な機能

Concurrent branch management with Git Worktrees
2 GitHub stars
Automated regression testing using Git Bisect binary search
Selective commit application via advanced cherry-picking
Interactive rebase for commit squashing and history cleanup
Emergency history recovery using the Git Reflog

ユースケース

Switching to urgent hotfixes without stashing or committing unfinished work using Worktrees.
Preparing clean, production-ready Pull Requests by squashing and reordering local commits.
Rapidly identifying the specific commit that introduced a regression in large codebases.