From: Jacob Keller <jacob.keller@gmail.com>
To: Elijah Newren <newren@gmail.com>
Cc: "Middelschulte, Leif" <Leif.Middelschulte@klsmartin.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: git merge banch w/ different submodule revision
Date: Sat, 28 Apr 2018 00:22:00 -0700 [thread overview]
Message-ID: <CA+P7+xrK85JMJW4bMhJVBbbcdgs=6MQKvoZqTvKdB4yBNVc7Ag@mail.gmail.com> (raw)
In-Reply-To: <CABPp-BGX-hQYdqfNQZ42313VVhKd7GzgUJqvgwOj=0TEO5UQpQ@mail.gmail.com>
On Fri, Apr 27, 2018 at 5:24 PM, Elijah Newren <newren@gmail.com> 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
prev parent reply other threads:[~2018-04-28 7:22 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-26 10:49 git merge banch w/ different submodule revision Middelschulte, Leif
2018-04-26 17:56 ` Stefan Beller
2018-04-26 21:46 ` Jacob Keller
2018-04-26 22:19 ` Stefan Beller
2018-04-30 17:02 ` Heiko Voigt
2018-05-02 7:30 ` Middelschulte, Leif
2018-05-03 16:42 ` Heiko Voigt
2018-05-04 8:29 ` Middelschulte, Leif
2018-05-04 10:18 ` Heiko Voigt
2018-05-04 14:43 ` Elijah Newren
2018-05-07 14:23 ` Middelschulte, Leif
2018-04-27 0:02 ` Elijah Newren
2018-04-27 0:19 ` Elijah Newren
2018-04-27 10:37 ` Middelschulte, Leif
2018-04-28 0:24 ` Elijah Newren
2018-04-28 7:22 ` Jacob Keller [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CA+P7+xrK85JMJW4bMhJVBbbcdgs=6MQKvoZqTvKdB4yBNVc7Ag@mail.gmail.com' \
--to=jacob.keller@gmail.com \
--cc=Leif.Middelschulte@klsmartin.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).