first commit
my test.txt
testssss
add two files
add two files
removed two files
conflict
change test.txt
changed content
rename text.txt
rename
changed in master
changed in first
..
change in first
changed in master
Merge branch 'firstbranch'

Conflicts:
	test.txt
added ruby