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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



"Catalin Marinas" <catalin.marinas@xxxxxxxxx> writes:

> On 09/03/06, Junio C Hamano <junkio@xxxxxxx> 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.


-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]