From: David Turner <novalis@novalis.org>
To: git@vger.kernel.org
Cc: brock.peabody@gmail.com
Subject: submodule modify/delete wrong message
Date: Mon, 04 Dec 2017 16:39:40 -0500 [thread overview]
Message-ID: <1512423580.9882.405.camel@novalis.org> (raw)
When merging with a submodule modify/delete conflict (i.e. I've deleted
the submodule, and I'm merging in a branch that modified it), git lies
about what it is doing:
"CONFLICT (modify/delete): submodule deleted in HEAD and modified in
submodules. Version submodules of submodule left in tree at
submodule~submodules.
Automatic merge failed; fix conflicts and then commit the result."
In fact, the working tree does not contain anything named
'submodule~submodules'.
In addition, I would ordinarily resolve a conflict like this by using
'git rm'. Here, this gives a warning:
$ git rm submodule
submodule: needs merge
rm 'submodule'
warning: Could not find section in .gitmodules where path=submodule
Git's behavior here is significantly better than liggit2's (which tries
to check out 'submodule' as if it were a blob, and fails to do so), but
it's still confusing.
It's not clear to me what the correct behavior is here. Maybe it's
sufficient to just fix the message?
next reply other threads:[~2017-12-04 21:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-04 21:39 David Turner [this message]
2017-12-11 20:27 ` submodule modify/delete wrong message Stefan Beller
2017-12-11 20:35 ` David Turner
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=1512423580.9882.405.camel@novalis.org \
--to=novalis@novalis.org \
--cc=brock.peabody@gmail.com \
--cc=git@vger.kernel.org \
/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).