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

Re: rebase - "fixup!" conflict applied at the wrong code location, why ?

From
Philippe Blain <levraiphilippeblain@gmail.com>
Date
Jul 8, 2020, 23:07 UTC
Message-ID
<C284D053-AD17-4321-88CD-3596F0FAF1AC@gmail.com>
In-Reply-To
<7A30EA48-72E3-47E1-9792-136D7B96DC84@gmail.com>
> Le 8 juil. 2020 à 19:03, Philippe Blain <levraiphilippeblain@gmail.com> a écrit :
> 
> Steps to reproduce:
Forgot to mention that all of this was tested with both Git 2.27.0 and 2.27.0.22.g20514004dd
Previous: Philippe BlainNext: Elijah Newren
Message 2 of 5 in “rebase - "fixup!" conflict applied at the wrong code location, why ?”
  1. Philippe BlainJul 8, 2020
  2. Philippe BlainJul 8, 2020
  3. Elijah NewrenJul 9, 2020
  4. Philippe BlainJul 14, 2020
  5. Elijah NewrenJul 14, 2020

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.