Re: Retry conflicting merge with matching line endings?

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

 



On Tue, Feb 17, 2009 at 6:18 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>
> This is not specific to fixing line ending but applies any "global token
> replacement" (e.g. you renamed a variable) operation in general.

Thanks for the details. I was previously resolving things in a more
tedious manner and your steps will make things easier for me.

What I was curious about though is whether it would be reasonable for
me to submit a patch to have git automatically try this for the
special case of line endings (possibly implemented as a general token
replacement scheme with built-in filters for line endings)?
--
To unsubscribe from this list: 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]

  Powered by Linux