Accept all merge conflicts in git
- by Micah
I'm trying to do a merge and there's a bunch of conflicts. It's all generated files so what I want to do is basically say "ignore all merge conflicts, and check everything in from my own repo".
I've tried
git checkout . --ours
git add -A
git com -a
It gives me an error though because there are still files in the "unmerged paths" bucket. How do I handle this?
Thanks!
