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?

  • git undo only changes to some files in a commit
  • Git Visual Studio 2015 Automatic commit upon successful build
  • what's difference about git branch -d <branchname> and git branch -D <branchname>
  • Git Initial Push Bad File Descriptor Error
  • git push not finding host
  • How to work with (sub)directory renames in Git?
  • Moving directories for portable git configuration
  • Move code between Git Repositories
  • Apt-get does not find package `git` on Ubuntu 12.04
  • Should I parse git status or use gitsharp?
  • i like to add the AOSP 4.3 to a gerrit project
  • `git rebase` entire branch-tree
  • 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.