From: Stefan Beller <sbeller@google.com>
To: Elijah Newren <newren@gmail.com>
Cc: git <git@vger.kernel.org>, real@ispras.ru
Subject: Re: [PATCH] merge-recursive: Handle addition of submodule on our side of history
Date: Tue, 14 Nov 2017 12:51:38 -0800 [thread overview]
Message-ID: <CAGZ79kZApzOsjns+q7mU=ta7OPd1fF7r8dWKY3GKa4sRTSMZ+w@mail.gmail.com> (raw)
In-Reply-To: <CAGZ79kbdC8fYx503=YKBvEE62=T5WYST0QSNuQjPp5QG1cx1aw@mail.gmail.com>
On Tue, Nov 14, 2017 at 10:48 AM, Stefan Beller <sbeller@google.com> wrote:
> test_expect_success 'unrelated file/submodule conflict is ignored' '
> (
> cd a_repo &&
> git checkout with_file^0 &&
> git cherry-pick with_sub^0
This makes no sense, yet. Sorry about the noise.
I think your patch is fine as is.
prev parent reply other threads:[~2017-11-14 20:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <ABPp-BHDrw_dAESic3xK7kC3jMgKeNQuPQF69OpbVYhRkbhJsw@mail.gmail.com>
2017-11-14 17:31 ` [PATCH] merge-recursive: Handle addition of submodule on our side of history Elijah Newren
2017-11-14 18:48 ` Stefan Beller
2017-11-14 20:51 ` Stefan Beller [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='CAGZ79kZApzOsjns+q7mU=ta7OPd1fF7r8dWKY3GKa4sRTSMZ+w@mail.gmail.com' \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=real@ispras.ru \
/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).