Git resolve conflict using --ours/--theirs for all files

Question

Is there a way to resolve conflict for all files using checkout --ours and --theirs? I know that you can do it for individual files but couldn\'t f

Answer 1

git checkout --[ours/theirs] . will do what you want, as long as you're at the root of all conflicts. ours/theirs only affects unmerged files so you shouldn't have to grep/find/etc conflicts specifically.