branch test
demo0.txt delect quick
AND simple
& simple
Merge branch 'feature1'
demo0.txt dev0 commit
demo0.txt master commit
demo0.txt conflict fixed master commit
add merge
merge with no-ff
bug fix
merged bug fix 101
commit modify0
commit delete modify