From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Martin Langhoff <martin.langhoff@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: Should rerere auto-update a merge resolution?
Date: Fri, 25 Aug 2017 12:19:56 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.21.1.1708251218460.7424@virtualbox> (raw)
In-Reply-To: <CACPiFCJCgKtTbKX8jCSC3QgMKZ7Usu2ojqXe5w_QAHwk7T4M-A@mail.gmail.com>
Hi Martin,
On Wed, 23 Aug 2017, Martin Langhoff wrote:
> On Wed, Aug 23, 2017 at 4:34 PM, Junio C Hamano <gitster@pobox.com> wrote:
> > Between these two steps:
> >
> >> - I reset hard, retry the merge, using --no-commit, rerere applies what it knows
> >> - I fix things up, then commit
> >
> > You'd tell rerere to forget what it knows because it is wrong.
>
> Questions
>
> - when I tell it to forget, won't it forget the pre-resolution state?
> my read of the rerere docs imply that it gets called during the merge
> to record the conflicted state.
In my hands, I need to tell rerere to forget, *and then recreate the merge
conflict* before I can resolve it again and let rerere learn the new
resolution.
> - would it be a feature if it updated its resolution db
> automagically? rerere is plenty automagic already...
That would most likely be a very welcome feature here.
Thanks,
Johannes
next prev parent reply other threads:[~2017-08-25 10:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-23 19:39 Should rerere auto-update a merge resolution? Martin Langhoff
2017-08-23 20:34 ` Junio C Hamano
2017-08-23 21:12 ` Martin Langhoff
2017-08-25 10:19 ` Johannes Schindelin [this message]
2017-08-25 16:13 ` Junio C Hamano
2017-08-25 15:16 ` Junio C Hamano
2017-08-25 16:07 ` Junio C Hamano
2017-08-25 17:08 ` Junio C Hamano
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=alpine.DEB.2.21.1.1708251218460.7424@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.langhoff@gmail.com \
/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).