Submodules on a branch

[Simon Peyton Jones]

·         I’m on a branch wip/T11067.

·         I do a ‘git merge origin/master’, resolve source code conflicts and commit

·         Then ‘git submodule update’

·         I have not touched libraries/unix

·         Yet when I say “git submodule” in a different HEAD tree, I get a different commit for libraries/unix than in my branch

Question (sticking plaster): how can I say “Just make my sub-modules match HEAD please”?

Question (cause): how can I ensure that I do update my branch to the submodule of HEAD when doing ‘git merge’?

Getting submodules out of sync is very tiresome.

Thanks

Simon
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-devs/attachments/20151208/48eeec02/attachment-0001.html>