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

Bug? Interactive rebase with reword after conflict

From
DVDániel Vörös <daniel.voros@gmail.com>
Date
Aug 13, 2018, 11:06 UTC
Message-ID
<CA+wscc=TKnWc+Dtq6U=EFZKWEd-0afwFD+mmfR53rA9Ts9toDA@mail.gmail.com>
Hey All,

I'm seeing some weird behavior when doing interactive rebase of a single commit with reword if there's a conflict. The rebased commit gets "squashed" into the target commit and is not a child of that.

I've asked this question in the git-users group first a few weeks ago, but got no explanation: https://groups.google.com/forum/?fromgroups#!topic/git-users/1X15nAts3mg

Please refer to the link above for detailed repro steps (reproducible with 2.18.0).

Kind Regards, Daniel

Next: Elijah Newren
Message 1 of 2 in “Bug? Interactive rebase with reword after conflict”
  1. Dániel VörösAug 13, 2018
  2. Elijah NewrenAug 13, 2018

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.