Answer by kris for How to do 'git checkout --theirs' for multiple files (or all unmerged files)

If your files are deeper than one directory (ie. there are subdirectories) and you want to selectively recursively choose all their files for a directory, then use the following:

grep -lr '<<<<<<<' directory_name/ | xargs git checkout --theirsgit add directory_name/*

(From an article on handling merge conflicts.)