add a local develop branch
reverion on develop
update in emacs, using C-v-v进行提交
在hotfix_1分支上作修改
merge
制作一个冲突
after confilct
delete >>>>