This branch has conflicts that must be resolved(git冲突的解决方案)

命令
进入你的项目根目录

git checkout master
git pull
git checkout  <分支名称>
git merge master
[ ... 解决你的冲突 ... ]
git add [修改后的冲突文件]
git commit
git push