How to avoid merge conflicts from pull?

This question already has an answer here:

How do I force “git pull” to overwrite local files? 36 answers

---

git pull --strategy theirs应该让你覆盖:)

链接地址: http://www.djcxy.com/p/4276.html

上一篇: git：切换分支并忽略没有提交的更改

下一篇: 如何避免合并冲突拉？