git-advancedlisted

# Advanced Git Operations ## Overview Master advanced Git workflows for complex version control scenarios. This skill covers sophisticated operations beyond basic commits and merges, including interactive rebasing, advanced conflict resolution, history manipulation, and strategic branch management. Use this skill when you need to: - Clean up messy commit history before code review - Resolve complex merge conflicts strategically - Hunt down bugs with binary search (bisect) - Recover lost commits or undo mistakes - Implement team branching strategies - Rewrite history safely ## Core Capabilities ### Interactive Rebasing - Reorder commits for logical history - Squash multiple commits into one - Edit commit messages retroactively - Split commits into smaller pieces - Remove unwanted commits from history ### Conflict Resolution - Strategic merge conflict handling - Three-way merge understanding - Ours vs theirs strategy selection - Conflict marker interpretation - Partial file staging during conflicts ### Git Bisect - Binary search for bug introduction - Automated bisect with scripts - Good/bad commit identification - Efficient debugging of regressions ### History Manipulation - Amend commits safely - Filter-branch operations - BFG Repo-Cleaner for large files - Rewrite history with caution - Preserve attribution and dates ### Branch Strategies - Git Flow workflow - Trunk-based development - Feature branch workflows - Release branch management - Hotfix procedures ## Quic