How to resolve a large number of conflicts in git merge?

Question

Can I choose which branch to use like svn?

Answer 1

Yes, it can be directly caused by 他人版本覆盖，或者你的版本提交，不过不推荐。出现这种情况很可能是分支管理不当.