git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Retry conflicting merge with matching line endings?

From
Sskillzero@gmail.com <skillzero@gmail.com>
Date
Feb 18, 2009, 03:44 UTC
Message-ID
<2729632a0902171944l7a5ca5b4nf6d77bc7f9c1b201@mail.gmail.com>
In-Reply-To
<7v8wo41o8d.fsf@gitster.siamese.dyndns.org>
On Tue, Feb 17, 2009 at 6:18 PM, Junio C Hamano <gitster@pobox.com> 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)?

Previous: Junio C Hamano
Message 3 of 3 in “Retry conflicting merge with matching line endings?”
  1. skillzero@gmail.comFeb 18, 2009
  2. Junio C HamanoFeb 18, 2009
  3. skillzero@gmail.comFeb 18, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.