如果新提交的分支代码和master有冲突,先checkout到分支merge master,解决冲突,
然后再checkout master,merge 分支.
(1) git checkout edit_package_page
git merge master --no-ff
这时候会看到很多CONFLICT (add/add): Merge conflict in <filenname>
git status 查看所有的冲突文件
vim 每一个文件解决一下冲突
git add .
git commit
git push
(2)git checkout master
git merge edit_package_pages --no-ff
git push
How to deal with the Unmerged paths,布布扣,bubuko.com
How to deal with the Unmerged paths
原文：http://www.cnblogs.com/iwangzheng/p/3790608.html