新的分支dev
新的分支feature1
主分支提交
解决冲突
new branch dev
merge with no-ff
test stash
fix bug 101
merge bug fix 101
test stash
bugfix in bugfix0
test resume from stash
Merge branch 'dev'