Code Maven
Slides
About
Press ? for keyboard navigation
❮
git rebase
Workflow for individuals
❯
Git Workflows
Workflow for individuals
Git workflows
Centralized Workflow
Repo start
Developer A
Developer B
git pull (fetch+merge)
Forgetting to rebase
git pull --rebase (fetch+rebase)
Resolve conflicts
Conflicting patch
Conflicting file
Resolve conflicting file
Continue rebase