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

Re: [PATCH 2/2] rebase -i -p: Fix --continue after a merge could not be redone

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 15, 2008, 10:16 UTC
Message-ID
<7v3agpyc9m.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<1229335531-32707-2-git-send-email-j6t@kdbg.org>
Johannes Sixt <j6t@kdbg.org> writes:
Show 11 quoted lines
> When a merge that has a conflict was rebased, then rebase stopped to let
> the user resolve the conflicts. However, thereafter --continue failed
> because the author-script was not saved. (This is rebase -i's way to
> preserve a commit's authorship.) This fixes it by doing taking the same
> failure route after a merge that is also taken after a normal cherry-pick.
>
> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
> ---
>  This is an attempt at fixing the failure.  I don't know whether it is
>  problematic to leave a "patch" behind if there was actually a merge.
>  Nevertheless, all rebase tests pass.
Interesting approach.  Dscho?
Previous: Johannes SixtNext: Johannes Schindelin
Message 4 of 6 in “Show a failure of rebase -p if the merge had a conflict”
  1. Show a failure of rebase -p if the merge had a conflictJohannes Sixt, Dec 11, 2008
  2. 1/2 Show a failure of rebase -p if the merge had a conflictJohannes Sixt, Dec 15, 2008
  3. 2/2 rebase -i -p: Fix --continue after a merge could not be redoneJohannes Sixt, Dec 15, 2008
  4. Junio C HamanoDec 15, 2008
  5. Johannes SchindelinDec 22, 2008
  6. Johannes SchindelinDec 22, 2008

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.