 #!/bin/bash
 
mkdir git-merge-test
cd git-merge-test
git init
touch merge.txt
git add merge.txt
echo "this is some content to mess with" > merge.txt
git commit -am 'we are commiting the inital content'
git checkout -b new_branch_to_merge_later
echo "totally different content to merge later" > merge.txt
git commit -am 'edited the content of merge.txt to cause a conflict'
git checkout master
echo "content to append" >> merge.txt
git commit -am"appended content to merge.txt"
git merge new_branch_to_merge_later

	#!/bin/bash

	mkdir git-merge-test
	cd git-merge-test
	git init
	touch merge.txt
	git add merge.txt
	echo "this is some content to mess with" > merge.txt
	git commit -am 'we are commiting the inital content'
	git checkout -b new_branch_to_merge_later
	echo "totally different content to merge later" > merge.txt
	git commit -am 'edited the content of merge.txt to cause a conflict'
	git checkout master
	echo "content to append" >> merge.txt
	git commit -am"appended content to merge.txt"
	git merge new_branch_to_merge_later