Note that this won't solve all cases. For example, you still have to watch out when merging branches with different submodule commit hashes that you run submodu

Note that this won't solve all cases. For example, you still have to watch out when merging branches with different submodule commit hashes that you run submodule update while merging.