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

Re: [PATCH] rebase -i: handle fixup of root commit correctly

From
Chris Webb <chris@arachsys.com>
Date
Jul 31, 2012, 12:48 UTC
Message-ID
<20120731124824.GC14028@arachsys.com>
In-Reply-To
<20120731111938.GD19416@arachsys.com>
Chris Webb <chris@arachsys.com> writes:
Show 5 quoted lines
> If we have a conflict in the middle of a chain of fixup/squashes, as far as
> I can see, we have a HEAD with all the previous successful fixups applied,
> conflict markers for the current failed pick, and when the conflict has been
> resolved, git rebase --continue will commit --amend the resolution and
> continue? Isn't that the correct behaviour here?

As an explicit test, I've just tried a chain of four squashed commits, each of which deliberately resulted in a conflict to manually resolve. For each squash, I was left with conflict markers on top of what had already been squashed in the expected way, and when I continued after resolving these, the resolution was 'commit --amend'ed in the expected way, with the same behaviour and resulting commit at the end of the rebase -i as I get with a copy of git without this patch.

Cheers,
Chris.
Previous: Chris WebbNext: Johannes Sixt
Message 5 of 7 in “rebase -i: handle fixup of root commit correctly”
  1. rebase -i: handle fixup of root commit correctlyChris Webb, Jul 24, 2012
  2. Junio C HamanoJul 24, 2012
  3. Johannes SixtJul 31, 2012
  4. Chris WebbJul 31, 2012
  5. Chris WebbJul 31, 2012
  6. Johannes SixtJul 31, 2012
  7. Chris WebbJul 31, 2012

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.