2个人，一个提交的是master主分支，一个是分出来的zm分支，想在线合并发现有冲突该怎么办？
http://www.imooc.com/video/4582
Resolve it manually. Check which files are in conflict. Go in and see that Git will identify the conflicting lines. You can manually remove the unnecessary ones and then submit them. Another person just force pull from origin.
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
http://www.imooc.com/video/4582
Resolve it manually. Check which files are in conflict. Go in and see that Git will identify the conflicting lines. You can manually remove the unnecessary ones and then submit them. Another person just force pull from origin.