git merge 4.0-ready -s theirs Could not find merge strategy 'theirs'. Available strategies are: octopus ours recursive resolve subtree. Причем в мануале она есть
"The recursive strategy can take the following options", сказано в мануале.
Т.е. -s recursive -X theirs