branch test
AND simple
feature1 modify readme
master modify readme
conflict fixed
branch dev add readme.trf
merge with no-ff
fix bug 101
merged bug fix 101