1 line added in feature1
conflict fixed
new branch dev
merge with --no-ff
a branch of Mingda created
Merge branch 'dev'

a update after mingda branch
bug 101 fixed
bug 002 fixed
bug 2 fixed and merge to master
pop stash
what is this