branch dev
branch feature1
this is   master branch
this is merge branch
this is   1+1=2
this is   test branch
this is  test branch
this is   second modify
this is master branch
this is merge
this is commit
dev branch   commit aa file
commit aa and test.txt
 this is  conflict file
delete 123.txt