Git merge in command line

List and filter all the files need resolve conflict, then apply certain git operation on them:

git diff --name-only --diff-filter=U|grep "\.html\|\.min\.js"|xargs -I{} sh -c "git checkout --theirs {} && git add {}"