#758681 When 'git submodule update' says "Skipping unmerged submodule", it doesn't say why or what to do

Package:
git
Source:
git
Description:
fast, scalable, distributed revision control system
Submitter:
Jonathan Nieder
Date:
2014-08-19 22:51:07 UTC
Severity:
wishlist
#758681#5
Date:
2014-08-19 22:48:25 UTC
From:
To:
From #git:

deric_skibotn> I did a merge and have a resolution conflict with a submodule,
               not sure what to do next
deric_skibotn> git status on the directory is "both modified:"
deric_skibotn> git submodule update ... => "Skipping unmerged submodule"
deric_skibotn> How do I point the submodule at the repos' newest commit?