localsetup-git-workflows

Interactive rebase lets you reorder, squash, or edit commits to clean up git history before merging. This skill provides structured commands and safeguards to automate interactive rebase operations and resolve conflicts across multi-branch projects.

Git bisect performs a binary search through your commit history to pinpoint the exact commit that introduced a regression. This skill automates the bisect workflow, guiding the process across branches to isolate defective code efficiently.

Git worktrees allow you to check out multiple branches simultaneously in separate directories, enabling parallel development within a monorepo. This skill provides guidance on setting up and managing worktrees to coordinate complex multi-branch workflows.

Reflog-based recovery is the best way to restore lost commits after accidental resets or branch deletions. This skill implements reflog recovery workflows to help you safely retrieve and restore dropped commits from your local git history.

Resolving merge conflicts during cherry-picking requires identifying conflicting changes and manually selecting the correct code segments. This skill provides structured guidance and safeguards for conflict resolution during cherry-picks and rebase operations.

Yes, this skill covers submodule and subtree management for complex projects. It provides structured guidance for integrating and coordinating external repositories, stabilizing development across monorepo and multi-branch environments.