From: Johannes Sixt <j.sixt@viscovery.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Petr Baudis <pasky@suse.cz>, Abhijit Menon-Sen <ams@toroid.org>,
git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH v2] Make cherry-pick use rerere for conflict resolution.
Date: Mon, 11 Aug 2008 13:49:33 +0200 [thread overview]
Message-ID: <48A0274D.8090504@viscovery.net> (raw)
In-Reply-To: <alpine.DEB.1.00.0808111328590.24820@pacific.mpi-cbg.de.mpi-cbg.de>
Johannes Schindelin schrieb:
> That would actually be a problem, no? I am not sure that resolutions for
> reverts make sense for cherry-picks, so I am not sure if resolutions
> should be recorded for reverts.
Of course they should. If the reversal is part of a topic branch that you
rebase at least once, then you want to have the resolutions recorded,
don't you?
-- Hannes
next prev parent reply other threads:[~2008-08-11 11:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-10 11:48 [PATCH] Make cherry-pick use rerere for conflict resolution Abhijit Menon-Sen
2008-08-10 23:12 ` Johannes Schindelin
2008-08-11 2:30 ` [PATCH v2] " Abhijit Menon-Sen
2008-08-11 10:19 ` Johannes Schindelin
2008-08-11 10:40 ` Petr Baudis
2008-08-11 11:32 ` Johannes Schindelin
2008-08-11 11:49 ` Johannes Sixt [this message]
2008-08-11 15:54 ` Johannes Schindelin
2008-08-12 7:02 ` Johannes Sixt
2008-08-11 18:47 ` Junio C Hamano
2008-08-12 2:34 ` Abhijit Menon-Sen
2008-08-12 6:59 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48A0274D.8090504@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=ams@toroid.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pasky@suse.cz \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.