* Conflict removed lines from the change set
@ 2013-05-10 12:10 nemo
0 siblings, 0 replies; only message in thread
From: nemo @ 2013-05-10 12:10 UTC (permalink / raw)
To: git
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.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-05-10 12:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-10 12:10 Conflict removed lines from the change set nemo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).