What is the benefit of using Git Worktrees over Stashing?

Worktrees allow you to have multiple branches checked out in separate folders simultaneously, enabling you to run tests or build different versions without switching contexts or losing uncommitted work.

Can this skill help me recover a branch I accidentally deleted?

Yes, it provides detailed Reflog workflows to locate the HEAD position of deleted branches and restore them within the 90-day safety window.

How does automated Git Bisect work with this skill?

The skill demonstrates how to integrate test scripts with the 'git bisect run' command to automatically identify the commit that introduced a bug via binary search.

Does this skill provide guidance on resolving rebase conflicts?

Yes, it includes best practices for handling conflicts during interactive rebases and explains how to safely use the --force-with-lease flag when pushing rewritten history.

Git Advanced Workflows

Name: Git Advanced Workflows
Author: HermeticOrmus

byHermeticOrmus

•

Developer Tools

Optimizes version control management through advanced interactive rebasing, history rewriting, and complex recovery techniques.

About

The Git Advanced Workflows skill equips Claude Code with the expertise to navigate high-stakes version control scenarios, from cleaning up messy feature histories before a pull request to recovering seemingly lost commits using the reflog. It provides structured patterns for using Git Bisect to pinpoint bugs, managing multiple active branches simultaneously with Worktrees, and strategically applying changes across releases via cherry-picking. This skill ensures that developers can maintain a professional, linear commit history while having a robust safety net for complex repository operations.

Key Features

Automated regression hunting using Git Bisect with test script integration.
Interactive rebase orchestration for squashing, reordering, and editing commits.
Emergency data recovery procedures using Git Reflog for lost refs and branches.
Strategic cherry-picking techniques for targeted code migration across branches.
2 GitHub stars
Concurrent branch management via Git Worktrees to avoid frequent stashing.

Use Cases

Identifying the specific commit that introduced a breaking change in a large, active repository.
Performing urgent hotfixes in a separate directory without interrupting the current development context.
Polishing and linearizing a local feature branch history before merging into the main codebase.

About

Key Features

Automated regression hunting using Git Bisect with test script integration.
Interactive rebase orchestration for squashing, reordering, and editing commits.
Emergency data recovery procedures using Git Reflog for lost refs and branches.
Strategic cherry-picking techniques for targeted code migration across branches.
2 GitHub stars
Concurrent branch management via Git Worktrees to avoid frequent stashing.

Use Cases

Identifying the specific commit that introduced a breaking change in a large, active repository.
Performing urgent hotfixes in a separate directory without interrupting the current development context.
Polishing and linearizing a local feature branch history before merging into the main codebase.