From: Junio C Hamano <gitster@pobox.com>
To: Stephen Bash <bash@genarts.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>
Subject: Re: [PATCH 2/2] attr: "binary" attribute should choose built-in "binary" merge driver
Date: Wed, 12 Sep 2012 10:01:30 -0700 [thread overview]
Message-ID: <7vhar3dvkl.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1734879571.321704.1347454681726.JavaMail.root@genarts.com> (Stephen Bash's message of "Wed, 12 Sep 2012 08:58:01 -0400 (EDT)")
Stephen Bash <bash@genarts.com> writes:
>> Perhaps something like this makes it better.
>
> Patch didn't apply on top of the previous two for me,...
Look at 'pu' and see how it applies.
> ... The only remaining
> question for me is should -Xtheirs resolve "deleted by them"
> conflicts?
I do not know, and I do not care to worry about it too deeply, which
means I would rather err on the safe side and have users inspect the
situation, make the decision when such a conflict happens and
resolve them themselves, instead of claiming a clean resolution that
is possibly wrong.
next prev parent reply other threads:[~2012-09-12 17:02 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1799969825.275125.1347028392272.JavaMail.root@genarts.com>
2012-09-07 14:48 ` Binary file-friendly merge -Xours or -Xtheirs? Stephen Bash
2012-09-07 21:47 ` Junio C Hamano
2012-09-09 4:40 ` [PATCH 0/2] Teaching -Xours/-Xtheirs to binary ll-merge driver Junio C Hamano
2012-09-09 4:40 ` [PATCH 1/2] merge: teach " Junio C Hamano
2012-09-09 4:40 ` [PATCH 2/2] attr: "binary" attribute should choose built-in "binary" merge driver Junio C Hamano
2012-09-10 14:03 ` Jeff King
2012-09-12 8:55 ` Junio C Hamano
2012-09-12 12:58 ` Stephen Bash
2012-09-12 17:01 ` Junio C Hamano [this message]
2012-09-12 17:50 ` Stephen Bash
2012-09-12 13:17 ` Jeff King
2012-09-09 14:30 ` [PATCH 0/2] Teaching -Xours/-Xtheirs to binary ll-merge driver Stephen Bash
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=7vhar3dvkl.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=bash@genarts.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).