Merging and resolving merge conflicts

Merging and resolving merge conflicts#

Learning Objectives#

After working through this topic, you should be able to:

  • Merge feature branches into the main branch

  • Understand why merge conflicts can happen

  • Explain the difference between the fast-forward and the recursive merge strategy

  • Fix merge conflicts

Materials#

For this topic we are building on the excellent YouTube playlist by NetNinja

Quiz#

Cards#
Contents