Thread (16 messages) 16 messages, 5 authors, 2018-05-07

Re: git merge banch w/ different submodule revision

From: Jacob Keller <hidden>
Date: 2018-04-28 07:22:25

On Fri, Apr 27, 2018 at 5:24 PM, Elijah Newren [off-list ref] wrote:
I would expect that a different example involving non-linear history
would behave the same, if both sides update the submodule in a fashion
that is just fast-forwarding and one commit contains the other in its
history.  I'm curious if you have a counter example.
My interpretation of the counter example was that the two submodule
updates were not linear (i.e. one did not contain the other after
updating).

I could be wrong, so more clarification from Lief would be helpful in
illuminating the problem.

Thanks,
Jake
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help