From: Junio C Hamano <gitster@pobox.com>
To: Gerrit Pape <pape@smarden.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: unexpected git-cherry-pick conflict
Date: Sat, 22 Dec 2007 00:20:38 -0800 [thread overview]
Message-ID: <7vsl1vywbt.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20071221103743.2210.qmail@80f7ec9d6d380d.315fe32.mid.smarden.org> (Gerrit Pape's message of "Fri, 21 Dec 2007 10:37:43 +0000")
Gerrit Pape <pape@smarden.org> writes:
> On Sat, Jul 07, 2007 at 09:58:08PM +0100, Johannes Schindelin wrote:
>> On Mon, 25 Jun 2007, Gerrit Pape wrote:
>> > Hi, did you get to this yet?, not to stress you, just to make sure we
>> > don't forget about it.
>>
>> Okay. Since now both you and Junio asked for it, and I made today a Git
>> day for me, I looked into this.
>
> Hi, the discussion on this topic unfortunately didn't result in a patch.
I know. Unfortunately the code structure in merge-recursive
around directory-file conflict handling needs major surgery to
fix this, and it won't be until somebody really sits down and
rethink the issue. I've been quietly working on some ideas and a
small nascent part of it is in 'pu' (or 'offcuts', perhaps, I do
not remember offhand), but it will take time.
next prev parent reply other threads:[~2007-12-22 8:21 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20070405071615.2915.6837.reportbug@acer>
[not found] ` <20070607074357.27760.qmail@69aef7b888effd.315fe32.mid.smarden.org>
[not found] ` <6b8a91420706070252y3fd581a3w427d91e5b982d29d@mail.gmail.com>
2007-06-13 9:16 ` unexpected git-cherry-pick conflict Gerrit Pape
2007-06-13 12:58 ` Johannes Schindelin
2007-06-13 13:43 ` Gerrit Pape
2007-06-13 14:43 ` Johannes Schindelin
2007-06-25 7:18 ` Gerrit Pape
2007-06-25 7:55 ` Johannes Schindelin
2007-07-07 20:58 ` Johannes Schindelin
2007-12-21 10:37 ` Gerrit Pape
2007-12-22 8:20 ` Junio C Hamano [this message]
2007-07-08 0:52 ` [PATCH] merge-tree: sometimes, d/f conflict is not an issue Johannes Schindelin
2007-07-08 1:31 ` Junio C Hamano
2007-07-08 2:00 ` Johannes Schindelin
2007-07-08 2:18 ` Johannes Schindelin
2007-07-08 4:35 ` Johannes Schindelin
2007-07-08 5:50 ` Junio C Hamano
2007-07-08 6:14 ` Junio C Hamano
2007-07-08 13:16 ` Johannes Schindelin
2007-07-08 20:02 ` Junio C Hamano
2007-07-09 15:06 ` merge-one-file, was " Johannes Schindelin
2007-07-17 17:13 ` [PATCH 1/2] merge-recursive: " Johannes Schindelin
2007-08-08 14:39 ` Gerrit Pape
2007-07-17 17:14 ` [PATCH 2/2] Add tests for cherry-pick d/f conflict which should be none Johannes Schindelin
2007-07-08 12:53 ` [PATCH] merge-tree: sometimes, d/f conflict is not an issue Johannes Schindelin
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=7vsl1vywbt.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=pape@smarden.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.
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 NNTP newsgroup(s).