git-advanced-workflows

This skill provides a comprehensive suite of advanced Git techniques designed for software engineers and DevOps practitioners who need to manage complex repository histories. It serves as an expert guide for maintaining a linear, clean project history and provides critical recovery mechanisms when git operations go wrong. The skill covers interactive rebase operations for rewriting history, cherry-picking to isolate features across branches, and git bisect for automated regression testing. It also teaches the use of git worktrees to enable concurrent development on multiple branches without context switching, and leverages reflog as a powerful safety net for recovering lost commits or deleted branches. This skill is ideal for teams collaborating on feature branches, developers preparing clean pull requests, or engineers troubleshooting historical bugs in production code. By using these protocols, you can transform messy commit logs into coherent, readable narratives.

• Interactive rebase strategies including squashing, reword, edit, and fixup commands for cleaner commit logs.

• Advanced cherry-picking workflows for applying specific hotfixes or features across release branches.

• Automated binary search debugging using git bisect with custom test scripts to identify root causes of regressions.

• Parallel branch management using git worktrees to prevent stashing and improve development velocity.

• Data recovery via git reflog to restore lost commits, fix accidental resets, and recover deleted branches.

• Best practices for rebase vs. merge, including when to force-push and how to maintain safe collaborative environments.

• Ensure you have a clear working directory before performing complex rebase or reset operations.

• When using git rebase -i, always verify the state of your HEAD before committing to a force push.

• Use git bisect run with exit codes 0 (good) and 1-127 (bad) for seamless automation of bug hunting.

• git worktrees require distinct filesystem paths; use prune to clean up stale configurations.

• Inputs typically involve existing local Git repositories; outputs include modified commit histories, restored branches, and bug-verified states.