多人开发使用git，coding.net作为代码库，现在2个人提交的文件起冲突了，该怎么办

Question

2个人，一个提交的是master主分支，一个是分出来的zm分支，想在线合并发现有冲突该怎么办？

Answer 1

http://www.imooc.com/video/4582

Answer 2

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.