Skip to content

Latest commit

 

History

History
executable file
·
20 lines (12 loc) · 436 Bytes

README.md

File metadata and controls

executable file
·
20 lines (12 loc) · 436 Bytes

Git Kata: Merge Mergesort

In this kata you will be facing your first merge conflict! There will be two different branches:

  • Mergesort-Impl
  • master

The task is to look at the merge conflict, and solve it by editing the file accordingly.

Setup:

  1. Run . setup.sh (or .\setup.ps1 in PowerShell)

The task

  1. Run git branch to see the two branches present
  2. git merge Mergesort-impl
  3. Solve the merge conflict :)