Git merge: accept theirs for multiple conflicts

I’m trying to merge a git branch (test-development) back into master. There are lots of merge conflicts but I want as many as possible to be resolved via –theirs. Is there a way to tell git to merge with –theirs in bulk?

  • VS Code Git clean recovery
  • Git always pulls files that I cant edit
  • Git ignore local file changes
  • How to perform better document version control on Excel files and SQL schema files
  • Can't see remote branch
  • Git - rollback to a previous commit
  • Transform a combined diff into a patch
  • What's the correct way to check if it's possible to perform a fast-forward merge with git merge-base?
  • NGit making a connection with a private key file
  • Git And SQL Server MDF Files
  • What data is being signed when you `git commit --gpg-sign=<key-id>`?
  • To hook or not to hook - git
  • One Solution collect form web for “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 ./path
    git add ./path
    git commit
    Git Baby is a git and github fan, let's start git clone.