Is it safe to force push after a rebase?

This skill recommends using 'git push --force-with-lease', which is a safer alternative that prevents overwriting work others have pushed to the remote branch.

How does Git bisect help with debugging?

It uses a binary search algorithm to narrow down which specific commit introduced a bug, supporting both manual testing and automated scripts.

When should I use rebase vs. merge?

Use rebase for cleaning local history and keeping feature branches updated; use merge for integrating features into main or preserving collaborative history.

What is a Git worktree and why use it?

A worktree allows you to have multiple branches checked out in different directories simultaneously, letting you handle urgent fixes without interrupting your main task.

Can this skill help me recover deleted branches?

Yes, it provides specific workflows using the Git reflog to identify and restore deleted commits or branches within the 90-day tracking window.

Advanced Git Workflows

Name: Advanced Git Workflows
Author: carloscroc

bycarloscroc

Developer Tools

Optimizes repository management using advanced Git techniques like rebasing, bisecting, and worktrees to maintain a clean history and recover lost work.

About

This Claude Code skill empowers developers to master sophisticated Git operations that go beyond basic branching and merging. It provides comprehensive guidance for interactive rebasing to clean up commit history, using Git bisect to pinpoint bug introductions, and leveraging worktrees for simultaneous multi-branch development. Whether you need to recover deleted commits via the reflog or cherry-pick specific changes across branches, this skill offers production-ready patterns and safety protocols to ensure repository integrity and collaborative efficiency in complex team environments.

Key Features

Interactive rebase guidance for history cleanup and squashing
Multi-branch management via Git worktrees to avoid stashing
Targeted commit application with advanced cherry-picking techniques
0 GitHub stars
Disaster recovery workflows using the Git reflog
Automated bug hunting patterns using Git bisect

Use Cases

Working on urgent hotfixes in a separate directory without interrupting your current feature branch
Finding the exact commit that introduced a regression bug in a large codebase
Cleaning up messy local commit history before submitting a Pull Request

About

Key Features

Interactive rebase guidance for history cleanup and squashing
Multi-branch management via Git worktrees to avoid stashing
Targeted commit application with advanced cherry-picking techniques
0 GitHub stars
Disaster recovery workflows using the Git reflog
Automated bug hunting patterns using Git bisect

Use Cases

Working on urgent hotfixes in a separate directory without interrupting your current feature branch
Finding the exact commit that introduced a regression bug in a large codebase
Cleaning up messy local commit history before submitting a Pull Request