# after your pull creates a lot of conflincts, if you just want to accept other devs' changes
grep -lr '<<<<<<<' . | xargs git checkout --theirs