Menu
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?
639
Often, merge conflicts happen when people make different changes to the same line of the same file, or when one person edits a file and another person deletes the same file. You must resolve all merge conflicts before you can merge a pull request on GitHub.
git pull --strategy theirs should have you covered :)
183
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
