All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Olivier Marin <dkr+ml.git@free.fr>, git@vger.kernel.org
Subject: Re: [PATCH] builtin-rerere: fix conflict markers parsing
Date: Mon, 07 Jul 2008 10:39:23 -0700	[thread overview]
Message-ID: <7vy74d4mr8.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.DEB.1.00.0807071400180.18205@racer> (Johannes Schindelin's message of "Mon, 7 Jul 2008 14:02:20 +0100 (BST)")

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> So what about
>
> 	<<<<<<< This hunk contains =====
> 	anythin
> 	=======
>
> 	Hello
> 	=======
> 	somethin else
> 	>>>>>>> problem!
>
>
> If you fix it, I think you should do it properly, and analyze the index.

I do not know offhand if analyzing the index is the right solution, but
your point is very valid.  You need to know which ====== is the real one
to be able to properly flip sides of the conflict.

I however think detecting that we have this ambiguous hunk is easy, and
punting gracefully and not re-resolving in such a case is million times
better than producing random results that the users need to be worried
about.

  parent reply	other threads:[~2008-07-07 17:40 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-07 12:42 [PATCH] builtin-rerere: fix conflict markers parsing Olivier Marin
2008-07-07 13:02 ` Johannes Schindelin
2008-07-07 13:55   ` Olivier Marin
2008-07-07 14:06     ` Johannes Schindelin
2008-07-07 14:44       ` Olivier Marin
2008-07-07 15:29         ` Johannes Schindelin
2008-07-07 17:39   ` Junio C Hamano [this message]
2008-07-08  7:52     ` Re* " Junio C Hamano
2008-07-08 10:42       ` Olivier Marin

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=7vy74d4mr8.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=dkr+ml.git@free.fr \
    --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. 
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.