From: "Chris Larson" <clarson@kergoth.com>
To: git@vger.kernel.org
Subject: Re: merge-recursive: do not rudely die on binary merge
Date: Tue, 14 Aug 2007 17:18:10 -0700 [thread overview]
Message-ID: <b6ebd0a50708141718w15ad2bbbrfa1d3c97ca7d4397@mail.gmail.com> (raw)
In-Reply-To: <7vlkcdacbi.fsf@assigned-by-dhcp.cox.net>
On 8/14/07, Junio C Hamano <gitster@pobox.com> wrote:
> Chris Shoemaker <c.shoemaker@cox.net> writes:
>
> >> This changes merge-recursive to still warn but do the "binary"
> >> merge for such a path; leave the "our" version in the working
> >> tree, but still keep the path unmerged so that the user can sort
> >> it out.
> >
> > Very nice.
>
> Forgot to ask. I did this because you had trouble on #git
> yesterday and then at around the same time today somebody else
> had the same issue. Did this patch solve your problem? I do
> not think this has big risk of regression, but if it does not
> help anything there is no reason to put it in 1.5.3, so I am
> asking for a success report.
I got bit by this one earlier, and the patch fixed it here.
--
Chris Larson - clarson at kergoth dot com
Dedicated Engineer - MontaVista - clarson at mvista dot com
Core Developer/Architect - TSLib, BitBake, OpenEmbedded, OpenZaurus
next prev parent reply other threads:[~2007-08-15 0:18 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-14 22:33 merge-recursive: do not rudely die on binary merge Junio C Hamano
2007-08-14 23:14 ` Chris Shoemaker
2007-08-15 0:07 ` Junio C Hamano
2007-08-15 11:19 ` Nikodemus Siivola
2007-08-15 11:50 ` Junio C Hamano
2007-08-20 3:36 ` [PATCH] Document what the stage numbers in the :$n:path syntax mean Steven Grimm
2007-08-20 5:52 ` Jeff King
2007-08-20 6:05 ` Shawn O. Pearce
2007-08-20 6:13 ` Shawn O. Pearce
2007-08-20 7:15 ` Florian Weimer
2007-08-20 8:04 ` Jeff King
2007-08-20 6:30 ` Junio C Hamano
2007-08-20 6:44 ` Jeff King
2007-08-22 0:14 ` Jakub Narebski
2007-08-20 6:37 ` Jeff King
2007-08-20 9:55 ` [PATCH] Document what the stage numbers in the :$n:path syntaxmean Johannes Sixt
2007-08-20 6:20 ` [PATCH] Document what the stage numbers in the :$n:path syntax mean Junio C Hamano
2007-08-20 18:08 ` Jan Hudec
2007-08-20 19:55 ` Junio C Hamano
2007-08-15 0:09 ` merge-recursive: do not rudely die on binary merge Junio C Hamano
2007-08-15 0:18 ` Chris Larson [this message]
2007-08-15 1:16 ` Chris Shoemaker
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=b6ebd0a50708141718w15ad2bbbrfa1d3c97ca7d4397@mail.gmail.com \
--to=clarson@kergoth.com \
--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 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).