From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Vincent van Ravesteijn <vfr@lyx.org>
Subject: Re: Edit a rerere conflict resolution
Date: Fri, 16 Mar 2012 09:42:47 -0700 [thread overview]
Message-ID: <7vobrwh4zc.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7vvcm4h61a.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Fri, 16 Mar 2012 09:20:01 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Vincent van Ravesteijn <vfr@lyx.org> writes:
>
>> No, I turned rerere.autoupdate off. Proven in the above by the line
>> "Resolved... " instead of "Staged...".
>
> Yeah, actually I just tried and the procedure works with or without
> autoupdate for me.
>
> So there is something different between our setup (or the nature of the
> conflict), but I do not know what it is offhand.
The last message from me on this topic for now as I'll be a bit too busy,
but a wild guess/hunch: grep NEEDSWORK near rerere.c::handle_cache()?
I suspect that we might need to also update this function to handle "both
sides added, but differently" case, as we do so in check_one_conflict()
these days, but for Vincent's particular case that shouldn't be the cause.
next prev parent reply other threads:[~2012-03-16 16:42 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-12 19:14 Edit a rerere conflict resolution Vincent van Ravesteijn
2012-03-12 20:01 ` Junio C Hamano
2012-03-12 20:20 ` Vincent van Ravesteijn
2012-03-12 20:34 ` Junio C Hamano
2012-03-12 21:21 ` Vincent van Ravesteijn
2012-03-12 21:34 ` Junio C Hamano
2012-03-12 21:39 ` Vincent van Ravesteijn
2012-03-12 21:40 ` Jakub Narebski
2012-03-12 21:52 ` Junio C Hamano
2012-03-16 15:54 ` Vincent van Ravesteijn
2012-03-16 16:01 ` Junio C Hamano
2012-03-16 16:14 ` Vincent van Ravesteijn
2012-03-16 16:20 ` Junio C Hamano
2012-03-16 16:37 ` Vincent van Ravesteijn
2012-03-16 16:42 ` Junio C Hamano [this message]
2012-03-17 11:03 ` Vincent van Ravesteijn
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=7vobrwh4zc.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=vfr@lyx.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).