From: Elijah Newren <newren@gmail.com>
To: daniel.voros@gmail.com
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Bug? Interactive rebase with reword after conflict
Date: Mon, 13 Aug 2018 07:37:34 -0700 [thread overview]
Message-ID: <CABPp-BHkD0Va_Mm+sFDyBH3gwCuR6UD-b3C07YcdS1x3QCzsRQ@mail.gmail.com> (raw)
In-Reply-To: <CA+wscc=TKnWc+Dtq6U=EFZKWEd-0afwFD+mmfR53rA9Ts9toDA@mail.gmail.com>
Hi,
On Mon, Aug 13, 2018 at 5:26 AM Dániel Vörös <daniel.voros@gmail.com> wrote:
> 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.
This was previously reported by "ch <cr@onlinehome.de>"[1] and fixed
in commit a9279c678588 ("sequencer: do not squash 'reword' commits
when we hit conflicts", 2018-06-19). This commit is part of current
master, but has not yet made it into a release. So, sadly, we don't
have a version you can update to to get the fix, unless you want to
build from source and either cherry-pick the change (it applles
cleanly to 2.18.0) or build a current version of master. However, it
should be part of 2.19 when that comes out.
[1] https://public-inbox.org/git/8e28202a-8646-53e8-8c22-389d61791c70@onlinehome.de/
> 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).
Thanks for reporting, and sorry we don't have an immediate solution
for you. It's coming, though.
Elijah
prev parent reply other threads:[~2018-08-13 14:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-13 11:06 Bug? Interactive rebase with reword after conflict Dániel Vörös
2018-08-13 14:37 ` Elijah Newren [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CABPp-BHkD0Va_Mm+sFDyBH3gwCuR6UD-b3C07YcdS1x3QCzsRQ@mail.gmail.com \
--to=newren@gmail.com \
--cc=daniel.voros@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).