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

Git merge improvement - "remove spaces/tabs from beginning of line and end of line"

From
DADušan Červenka | ACRIOS <cervenka@acrios.com>
Date
Aug 10, 2021, 22:25 UTC
Message-ID
<2632907.cDO7J6XS3R@kuhadatko-gl552vw>
Greetings,

i was interested if you already considered this as feature, or if you may consider this as good feature. I know that during merge every character need be considered. And at the end it will be. I described my problem to another developer and he named this feature as good noise merge reduction.

Issue: Several times it happened that i added or removed condition in code but a lot of code stayed. Only indention was changed. If there was also other change on some line i had a conflict. And several times it happened that a lot of code was appended instead of replaced (if some line was similar with same indention). This made merging messed and confusing. If we would remove this spaces noise from beginning and end, we could get more acquired merge. What do you think? Of course this is only for looking for most matching lines. At the end the code should keep all necessary spaces.

 
Thank you very much for your opinion.
-- 
 

Dušan Červenka | Software Developer 
a: ACRIOS Systems s.r.o. | Razinova 2257/5 | Ostrava 700 30 
e: cervenka@acrios.com | w: www.acrios.com 
m: +421 918 715 117 
Next: Jeff King
Message 1 of 3 in “Git merge improvement - "remove spaces/tabs from beginning of line and end of line"”
  1. Dušan Červenka | ACRIOSAug 10, 2021
  2. Jeff KingAug 11, 2021
  3. Dušan Červenka | ACRIOSAug 13, 2021

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.