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

Well In my parent directory I see:

$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Unmerged paths:
(use "git reset HEAD ..." to unstage)
(use "git add ..." to mark resolution)

So I just did this

git reset HEAD linux