merge conflict for a git submodule entry point
Posted January 17, 2014on:
let’s say path/to/submodule is a newly added git submodule, but we are merging in a branch which was created before the submodule was created, now git merge added a directory itself, which obviously you cannot either git add or git rm, since that would destroy the submodule setup in HEAD.
what can you do?
run git mergetool and you are done! git will discover itself that it doesn’t need to do anything about this submodule and that is the best solution.