git status | grep both | awk '{print $3}' | xargs git checkout --[theirs|ours]
출처: https://stackoverflow.com/questions/24743769/git-resolve-conflict-using-ours-theirs-for-all-files#comment56201670_24743875
