before initiating fix branch dev.fix from dev,Merge branch 'dev' of github.com:huangyingw/gitrc into dev
n
merge the fix from dev.fix,n
Merge branch 'dev.fix' into dev
Merge branch 'dev' of github.com:huangyingw/gitrc into dev