Git Kata: Merge Conflict

Setup:

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

The task

In this kata git cannot figure out how to merge the content added on merge-conflict-branch1 with the content on master.

Both changes need to be in master when you're done.

Use git merge to bring the changes from merge-conflict-branch1 on to master.
What does git status now report.
Fix the conflict with your favorite editor.
Follow the instructions in git status to complete the merge.
What does git log --oneline --graph show?

Relevant commands

git merge
git status
git add
git commit
git log --oneline --graph