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

ignore blank line removals

From
John Rood <mr.john.rood@gmail.com>
Date
Nov 3, 2016, 15:57 UTC
Message-ID
<CALj-rGcSrbAiyxPOYD1KCacK_gqi3T5_R=e0H_UfBTqLb5VRmg@mail.gmail.com>
If the contents of a file initially are:
  one
  three
and on branch A there is a commit, removing the blank line:
  one
  three
and on branch B there is a commit, adding 'two':
  one
  two
  three
Normally, if you try to merge A into B (or B into A), git recognizes a
decision needs to be made between removing the second line or add
"two" to the second line. It would be convenient to have a merge
strategy that defaults to the latter in cases where the removed line
was a blank line (or a line containing only whitespace) ...something
like -Xignore-blank-line-removals.
Next: John Rood
Message 1 of 4 in “ignore blank line removals”
  1. John RoodNov 3, 2016
  2. John RoodNov 15, 2016
  3. Junio C HamanoNov 15, 2016
  4. John RoodNov 15, 2016

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.