bran: 1 commit
bran: 2 commit
master : 1 opra
merge bran and master with deal conflict
bran: add new file 2.txt
Merge branch 'bran'
bran: after merge modify
merge bran after deal conflict
delete 1.txt last line
merge again after deal conflict again
full bran
Merge branch 'bran'
add 3.txt
Merge branch 'bran'
bran 3: add 3.txt
to jiejue issue:
Merge branch 'issue-1'
modify dev
merge master and dev