From: Vincent van Ravesteijn <vfr@lyx.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: Edit a rerere conflict resolution
Date: Fri, 16 Mar 2012 17:37:51 +0100 [thread overview]
Message-ID: <4F636C5F.1060509@lyx.org> (raw)
In-Reply-To: <7vvcm4h61a.fsf@alter.siamese.dyndns.org>
Op 16-3-2012 17:20, Junio C Hamano schreef:
> 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.
Hmm.. The behaviour seems to be different for the "official Git for
Windows 1.7.9" as for the version I compiled myself with MSVC.
First, the sha1s in the rerere cache differ. Second, when using the MSVC
version to generate the preimages and resolutions, I can use both
version to forget the resolution again.
Maybe another EOL-style problem ?
Vincent
next prev parent reply other threads:[~2012-03-16 16:38 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 [this message]
2012-03-16 16:42 ` Junio C Hamano
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=4F636C5F.1060509@lyx.org \
--to=vfr@lyx.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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.