Skip to content

README.md

Latest commit

 

History

History
30 lines (22 loc) · 881 Bytes

README.md

File metadata and controls

30 lines (22 loc) · 881 Bytes
Raw

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 source setup.sh (or .\setup.ps1 in PowerShell)

The task

  1. Run git branch to see the two branches present
  2. Merge Mergesort-Impl into master
  3. Either:
    1. Solve the merge conflict with your favorite editor and finish the merge (git status will tell you what to do), or
    2. Use git mergetool --tool=emerge (for emacs fans) or git mergetool --tool=vimdiff (for vim fans) and finish the merge (git status will tell you what to do)

Relevant commands

  • git branch
  • git merge
  • git status
  • git mergetool --tool=emerge
  • git mergetool --tool=vimdiff
  • git add
  • git commit