Git Advanced Workflows

---
version: 4.1.0-fractal
name: git-advanced-workflows
description: Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.
---

# Git Advanced Workflows

Master advanced Git techniques to maintain clean history, collaborate effectively, and recover from any situation with confidence.

## Do not use this skill when

- The task is unrelated to git advanced workflows
- You need a different domain or tool outside this scope

## Instructions

- Clarify goals, constraints, and required inputs.
- Apply relevant best practices and validate outcomes.
- Provide actionable steps and verification.
- If detailed examples are required, open `resources/implementation-playbook.md`.

## Use this skill when

- Cleaning up commit history before merging
- Applying specific commits across branches
- Finding commits that introduced bugs
- Working on multiple features simultaneously
- Recovering from Git mistakes or lost commits
- Managing complex branch workflows
- Preparing clean PRs for review
- Synchronizing diverged branches

## Core Concepts

## 🧠 Knowledge Modules (Fractal Skills)

### 1. [1. Interactive Rebase](./sub-skills/1-interactive-rebase.md)
### 2. [2. Cherry-Picking](./sub-skills/2-cherry-picking.md)
### 3. [3. Git Bisect](./sub-skills/3-git-bisect.md)
### 4. [4. Worktrees](./sub-skills/4-worktrees.md)
### 5. [5. Reflog](./sub-skills/5-reflog.md)
### 6. [Workflow 1: Clean Up Feature Branch Before PR](./sub-skills/workflow-1-clean-up-feature-branch-before-pr.md)
### 7. [Workflow 2: Apply Hotfix to Multiple Releases](./sub-skills/workflow-2-apply-hotfix-to-multiple-releases.md)
### 8. [Workflow 3: Find Bug Introduction](./sub-skills/workflow-3-find-bug-introduction.md)
### 9. [Workflow 4: Multi-Branch Development](./sub-skills/workflow-4-multi-branch-development.md)
### 10. [Workflow 5: Recover from Mistakes](./sub-skills/workflow-5-recover-from-mistakes.md)
### 11. [Rebase vs Merge Strategy](./sub-skills/rebase-vs-merge-strategy.md)
### 12. [Autosquash Workflow](./sub-skills/autosquash-workflow.md)
### 13. [Split Commit](./sub-skills/split-commit.md)
### 14. [Partial Cherry-Pick](./sub-skills/partial-cherry-pick.md)