Lesson 6 · Merge strategies

Merge strategies

Pick the right way to bring work together, and fix conflicts without panic.

Coming soon

What it will cover

  • Fast-forward vs merge commit
  • Rebase
  • Squash
  • Handling conflicts
  • Cherry-pick

See this stage on the roadmap →