How do I manage conflicts with git submodules?

Question

I have a git superproject that references several submodules and I am trying to lock down a workflow for the rest of the my project members to work within.

For this

Answer 1

Got help from this discussion. In my case the

git reset HEAD subby
git commit

worked for me :)