git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] merge-recursive: Handle addition of submodule on our side of history

From
Stefan Beller <sbeller@google.com>
Date
Nov 14, 2017, 20:51 UTC
Message-ID
<CAGZ79kZApzOsjns+q7mU=ta7OPd1fF7r8dWKY3GKa4sRTSMZ+w@mail.gmail.com>
In-Reply-To
<CAGZ79kbdC8fYx503=YKBvEE62=T5WYST0QSNuQjPp5QG1cx1aw@mail.gmail.com>
On Tue, Nov 14, 2017 at 10:48 AM, Stefan Beller <sbeller@google.com> wrote:
Show 5 quoted lines
>     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.

Previous: Stefan Beller
Message 3 of 3 in “merge-recursive: Handle addition of submodule on our side of history”
  1. merge-recursive: Handle addition of submodule on our side of historyElijah Newren, Nov 14, 2017
  2. Stefan BellerNov 14, 2017
  3. Stefan BellerNov 14, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.