02Track 2 of 11

Branching & Merging

Parallel timelines.

10 lessons1970 XP
Start the track
  1. 01
    Create & Switch
    Start a parallel line of work off main
    +180 XP
  2. 02
    Merge Strategies
    Fast-forward vs three-way: two ways branches combine
    +220 XP
  3. 03
    Rebase for Linear History
    Replay your commits on top of another branch for linear history
    +280 XP
  4. 04
    Divergent Branches
    When local and remote diverge
    +250 XP
  5. 05
    Listing & Filtering Branches
    Find any branch in a sea of them
    +140 XP
  6. 06
    Renaming Branches
    Fix a typo without losing work
    +130 XP
  7. 07
    Branch Naming Conventions
    Names that scale beyond ten devs
    +110 XP
  8. 08
    Upstream & Tracking Branches
    Make `git push` and `git pull` know where to go
    +200 XP
  9. 09
    Squash Merge
    Collapse a feature branch into one clean commit
    +200 XP
  10. 10
    Resolving Merge Conflicts
    Read the markers, pick the right side
    +260 XP
← Previous trackFoundationsNext track →Inspection & Debugging