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

Retry conflicting merge with matching line endings?

From
Sskillzero@gmail.com <skillzero@gmail.com>
Date
Feb 18, 2009, 01:55 UTC
Message-ID
<2729632a0902171755n3e89e717p6b3a38b556252bfb@mail.gmail.com>

I've been running into a lot of merge conflicts due to line endings changing. For example, I branch from master when a file has CRLF line endings (incorrectly) then somebody fixes a bug in that file (still has CRLF line endings) on master then I realize the file should have LF line endings so I change them. When I try to rebase on master later, I get a merge conflict because it looks like every line has changed and it conflicts with that other bug fix.

Would it be reasonable that if you get a conflict during a merge and the line endings of the two commits are different then change the line endings to match, retry the merge of that file, then apply the line ending change commit?

Next: Junio C Hamano
Message 1 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.