From: Juan Palacios <jpalacios@atlassian.com>
To: git@vger.kernel.org
Subject: Bug Report: Submodule conflict error message
Date: Fri, 24 Oct 2014 13:46:51 +1100 [thread overview]
Message-ID: <CABY2JrJBgFDP-gKWUR438PiuB+g0g2wrD9Hoa-fkfCUyUaGp6w@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 993 bytes --]
In a project with a submodule, if you merge two diverging branches in
which one branch updated which commit the submodule points to, and the
other branch moves the submodule to a new location, the resulting
merge error message does not provide information about what the
conflict was, or the path to the conflicted directory.
I've attached a short script which sets up a project with a submodule
and creates both branches. If after running it you cd into
'top-level-project' and run 'git merge
branch_that_points_the_submodule_to_new_commit' the resulting error
message is:
Auto-merging submodule-moved
Adding as submodule-moved~HEAD instead
Automatic merge failed; fix conflicts and then commit the result.
I would have expected an output in line with other merge conflict
messages. Something with the format:
CONFLICT (<REASON>): Merge conflict in <PATH_TO_CONFLICT>
Where <REASON> would be something like (delete/modify) I believe this
might be a bug in the implementation.
Thank you
[-- Attachment #2: submodule-conflict.sh --]
[-- Type: application/x-sh, Size: 1146 bytes --]
reply other threads:[~2014-10-24 2:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CABY2JrJBgFDP-gKWUR438PiuB+g0g2wrD9Hoa-fkfCUyUaGp6w@mail.gmail.com \
--to=jpalacios@atlassian.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.
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 NNTP newsgroup(s).