Re: bug?: stgit creates (unneccessary?) conflicts when pulling

From: Junio C Hamano <junkio@cox.net>
Date: Mar 11, 2006, 06:46 UTC
Message-ID: <7vfylpxyvc.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <b0943d9e0603100313l37f67f62h@mail.gmail.com>

"Catalin Marinas" <catalin.marinas@gmail.com> writes:

Show 15 quoted lines

> On 09/03/06, Junio C Hamano <junkio@cox.net> wrote:
>
>> Yup, it was originally done to improve the performance of
>> resolve merge strategy, but I am glad somebody else has found
>> use for it.
>
> Actually, I asked for it about 6 months ago:
>
> http://marc.theaimsgroup.com/?l=git&m=112677889118711&w=2
>
> and I got the reply from you :-):
>
> http://marc.theaimsgroup.com/?l=git&m=112690084826630&w=2
>
> Anyway, it's good we have it...

I had this one in mind:

        http://marc.theaimsgroup.com/?t=113874460800001&r=1&w=2

Specifically, this message:

	http://marc.theaimsgroup.com/?l=git&m=113874886615202&w=2

It seems that this has been an recurring issue.