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

Re: What is the status of merging with whitespace conflicts?

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 2, 2009, 17:04 UTC
Message-ID
<7vy6lli9xh.fsf@alter.siamese.dyndns.org>
In-Reply-To
<46a038f90912020234g3094cccbxd8ca80c7c0b32ca4@mail.gmail.com>

I am not working on it, and I didn't hear from anybody who is. If you limit the whitespace-only changes to the ones that do not cross line boundary, it wouldn't be too hard to add. Probably it would take less than one summer for a good student.

Previous: Martin Langhoff
Message 2 of 2 in “What is the status of merging with whitespace conflicts?”
  1. Martin LanghoffDec 2, 2009
  2. Junio C HamanoDec 2, 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.