Module 02 of 04 · Git & GitHub
Branching and Combining Work
Work in parallel, then bring it back together and handle the overlaps.
4 of 4 lessons available
Lessons in this module
- 0114 min
Branches
BeginnerCreate and switch branches to work on things independently.
- 0214 min
Merging
BeginnerBring a branch back and understand what a merge commit records.
- 0316 min
Rebasing
BeginnerReplay commits onto a new base, and know when not to.
- 0415 min
Resolving Conflicts
BeginnerRead a conflict and resolve it deliberately.
Have a project worth talking through?
Tell us what you're building or what's slowing your current system down. We'll give you a direct read on scope and approach.