EDIT: Never mind, git checkout --ours <paths> resolves the conflicts neatly.
=============
I've got 40 conflicts during git merge, and I know that all mine a correct. Answers to a similar question explain how to resolve using git mergetool -y and vimdiff. However, that's still a bit too long to resolve 40 conflicts in the manner I know how before viewing the files. Is there a way to script resolving all changes in favor of local (mine) for all 40 conflicts?
