What problem does it solve?
Complex collaborative development often requires advanced Git techniques beyond basic commit and push operations. This skill provides comprehensive guidance on advanced Git workflows, helping you manage complex version control scenarios, maintain a clean history, and resolve conflicts efficiently.
Core Features & Use Cases
- History Rewriting: Techniques like rebasing and interactive rebase for cleaning up commit history.
- Code Portability: Strategies for cherry-picking commits and managing submodules for flexible code sharing.
- Conflict Resolution: Advanced methods for resolving complex merge conflicts, saving time and frustration.
- Use Case: You've been working on a feature branch and need to integrate it cleanly into the main branch, but the main branch has diverged significantly. Use this skill to perform an interactive rebase, squashing commits and resolving conflicts to create a clean, linear history.
Quick Start
Use the git-advanced-workflows skill to explain how to use 'git rebase -i' to squash multiple commits into one.