Basically, you have to choose which of the two alternative submodule
revisions is the one you want.
Or, you have to also do a merge at the submodule to get the best of
both, and ensure that it is saved/pushed etc, and then pulled, so you
have the third choice that will match the effective merge at the super
project.
The various caveats are in the manual pages.
Sub-module management is a local social & management issue rather than a
pure technical issue - you'll need to talk to folks ;-)
Philip
On 20/03/2019 22:50, Noah Hoffman wrote:
I should add I know the ref is stored in the object database from
running this:
$ git ls-tree master MySubModule
160000 commit 7927d2d87c46687e1e1952f40df8d1d2af0a7bd6MySubModule
--
You received this message because you are subscribed to the Google
Groups "Git for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send
an email to git-users+unsubscr...@googlegroups.com
<mailto:git-users+unsubscr...@googlegroups.com>.
For more options, visit https://groups.google.com/d/optout.
--
You received this message because you are subscribed to the Google Groups "Git for
human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
