git merge recursive theirs, how does it work?

Question

I\'m having a bit of a problem. We have our own CMS which is using git for collaboration and versioning and stuff.

Now I have two git repositories A and B, A which i

Answer 1

You must use this form to pass merge strategy options:

git merge -s recursive -Xtheirs # short options
git merge --strategy recursive --strategy-option theirs # long options

Also make sure your version supports -Xtheirs, that's a quite recent feature(?)