Git merge: accept theirs for multiple conflicts
This will do it if you're mid-merge:
git merge test-development# Automatic merge failed, a bunch of conflicts!git checkout --theirs ./pathgit add ./pathgit commit
This will do it if you're mid-merge:
git merge test-development# Automatic merge failed, a bunch of conflicts!git checkout --theirs ./pathgit add ./pathgit commit