branch test
AND simple
& simple
conflict fixed
mytest branch
test test
Merge branch 'mytest'
add myfile.txt
this is your test add
this is master add
ha ha ha ha add
Merge branch 'yourtest'
as add
add merge
merge with no-ff
use fast forward