Git Kata 4: Merge Conflicts

Learn about the merging of two branches where the differences can't be auto-merged.

Step 1: Modify the file in the main branch

To append to the file and save:

  • Add (I want ripple chips) to Crispy Chips.
    • Crispy Chips (I want ripple chips)
    • Save the changes.

Get hands-on with 1400+ tech skills courses.