ruipacheco ruipacheco - 1 year ago 74
Git Question

How to avoid merge conflicts from pull?

I keep the repositories of several open source projects locally for reference. I update them infrequently and the result is that I end up with merge conflicts. When it comes to the Linux kernel this can be hundreds of files.

How can I tell git to pull from upstream and accept all changes blindly?

Answer Source

git pull --strategy theirs should have you covered :)