Creating a git repo with a merge conflict for testing purposes.

merge-conflict.sh

#!/bin/sh

# Creating a git repo with a merge conflict for testing purposes.

mkdir merge
cd merge
git init
echo "BASE" > conflict.txt
git add conflict.txt
git commit -m "Initial commit"
git checkout -b br
echo "REMOTE" > conflict.txt
git commit -a -m "br commit"
git checkout master
echo "LOCAL" > conflict.txt
git commit -a -m "master commit"
git merge br