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

Conflict removed lines from the change set

From
Nnemo <nemo@ikkoku.de>
Date
May 10, 2013, 12:10 UTC
Message-ID
<1368187847.18427.8.camel@nemo>

It seems that on conflict git 1.8.1.2 removes lines below the preserved line.

Before merging my master branch onto my staging branch I have this in the soon to be conflicting file:

  [... stuff ...]
  lib.printMenuBottom.10.20.typolink.additionalParams =
&print=1&no_cache=1
  [... stuff ...]
The changes from master look like this:
  [... stuff ...]
+
+ [globalVar = GP:tx_gois24api_piModeratedShow|action|show = expose]
+ lib.printMenuBottom.10.20.typolink.additionalParams =
&print=1&no_cache=1&type=26
+ [else]
  lib.printMenuBottom.10.20.typolink.additionalParams =
&print=1&no_cache=1
 +[global]
  [... stuff ...]
After merging and having a conflict git-diff reports this:
++<<<<<<< HEAD
++=======
+ 
+ [globalVar = GP:tx_gois24api_piModeratedShow|action|show = expose]
+ lib.printMenuBottom.10.20.typolink.additionalParams =
&print=1&no_cache=1&type=26
+ [else]
++>>>>>>> master
  lib.printMenuBottom.10.20.typolink.additionalParams =
&print=1&no_cache=1
 -[global]
 -

Why is the [global] line marked for removal? I presume that this should not be the case.

Message 1 of 1 in “Conflict removed lines from the change set”
  1. nemoMay 10, 2013

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.