add a file to mybranch branch
updata with 'and b1'
updata with 'and master'
merge
build branch bran
merge bran with --no-ff
11/14--13:47
gitbranch_test updata in 11/14--13:48
issue_01
updata gitbranch_test.txt in b1
merge gitbranch_test.txt
resolve the conflict between b1 and master
updata index.js by zhangyihua in bran1
add xiaoli to index.js by zhangyihua in bran1
add liu to index.js
merge conflict in index.js