Git submodule conflicts
June 5th, 2008
If you ever get this message:
$ git pull fatal: cannot merge modes? Merge with strategy recursive failed.
It's because there are conflicting submodules - you need to make sure your local submodules match those of the origin before pulling.
Sorry, comments are closed for this article.