From: Stefan Beller <sbeller@google.com>
To: Dakota Hawkins <dakotahawkins@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>, mwitte@ara.com
Subject: Re: If a branch moves a submodule, "merge --ff[-only]" succeeds while "merge --no-ff" fails with conflicts
Date: Fri, 9 Sep 2016 16:57:02 -0700 [thread overview]
Message-ID: <CAGZ79kapz7PR7vO2oyWE8WygXr+hTSJeZfZgpyeERv+Z1jTjCQ@mail.gmail.com> (raw)
In-Reply-To: <CAG0BQXmyW-Hzdyj4rTviToEVbJ73d94P9GcfFVR6P2XCsA2t-g@mail.gmail.com>
On Fri, Sep 9, 2016 at 4:37 PM, Dakota Hawkins <dakotahawkins@gmail.com> wrote:
> Any ideas on this anywhere?
>
> In my opinion if a merge can fast-forward without conflict it should
> trivially be able to non-fast-forward without conflict.
Yes, I agree. Though the submodules still have a lot of sharp edges
that you can injure yourself with.
I am sorry to let you down here, but I did not have time and mental
capacity to actually dive into the issue further this week.
I hoped someone else would have picked up this thread and have
a good idea.
As you know currently the checkout doesn't touch submodules, i.e.
you have to run "git submodule update" whenever the submodule
changes. So when you checkout a different part of history, that moved
a submodule, this will fail as the submodule still resides at the old
place (and may have path name conflict with another thing)
and is not there at the new place.
I plan to fix that in the near future (read: teach git checkout to know
about submodules), mind that there is already a patch series for
exactly that out there in one of the branches of
https://github.com/jlehmann/git-submod-enhancements
This seems to be not an easy fix; Someone tried already and getting
it polished enough to include it upstream was not successful.
>
> Also, I'm not too familiar/comfortable with mailing list etiquette,
> and I don't want to be a bother by continuing to ping this thread.
Pinging is fine, as it is rather easy to ignore mails on a mailing list. ;)
I just don't know if it increases likelihood of someone responding.
Thanks,
Stefan
next prev parent reply other threads:[~2016-09-09 23:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-02 19:22 If a branch moves a submodule, "merge --ff[-only]" succeeds while "merge --no-ff" fails with conflicts Dakota Hawkins
2016-09-06 18:40 ` Dakota Hawkins
2016-09-06 19:00 ` Stefan Beller
2016-09-06 20:02 ` Dakota Hawkins
2016-09-09 23:37 ` Dakota Hawkins
2016-09-09 23:57 ` Stefan Beller [this message]
2016-09-10 0:17 ` Dakota Hawkins
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=CAGZ79kapz7PR7vO2oyWE8WygXr+hTSJeZfZgpyeERv+Z1jTjCQ@mail.gmail.com \
--to=sbeller@google.com \
--cc=dakotahawkins@gmail.com \
--cc=git@vger.kernel.org \
--cc=mwitte@ara.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).