branch test
init
and simple
&simple
resolve conflict
noff
merge with --no-ff
test
fix bug no 101
merge fixbug 101
stash
merge stash