{"thread":{"id":"33770","subject":"Conflict removed lines from the change set","startedAt":"2013-05-10T12:10:47Z","lastAt":"2013-05-10T12:10:47Z","messageCount":1,"participants":["nemo"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"216870","messageId":"1368187847.18427.8.camel@nemo","threadId":"33770","inReplyTo":null,"subject":"Conflict removed lines from the change set","fromName":"nemo","fromEmail":"nemo@ikkoku.de","sentAt":"2013-05-10T12:10:47Z","receivedAt":"2013-05-10T12:10:47Z","isPatch":false,"sender":{"key":"nemo@ikkoku.de","avatar":null},"body":"It seems that on conflict git 1.8.1.2 removes lines\nbelow the preserved line.\n\nBefore merging my master branch onto my staging branch\nI have this in the soon to be conflicting file:\n\n  [... stuff ...]\n  lib.printMenuBottom.10.20.typolink.additionalParams =\n&print=1&no_cache=1\n  [... stuff ...]\n\nThe changes from master look like this:\n\n  [... stuff ...]\n+\n+ [globalVar = GP:tx_gois24api_piModeratedShow|action|show = expose]\n+ lib.printMenuBottom.10.20.typolink.additionalParams =\n&print=1&no_cache=1&type=26\n+ [else]\n  lib.printMenuBottom.10.20.typolink.additionalParams =\n&print=1&no_cache=1\n +[global]\n  [... stuff ...]\n\nAfter merging and having a conflict git-diff reports this:\n\n++<<<<<<< HEAD\n++=======\n+ \n+ [globalVar = GP:tx_gois24api_piModeratedShow|action|show = expose]\n+ lib.printMenuBottom.10.20.typolink.additionalParams =\n&print=1&no_cache=1&type=26\n+ [else]\n++>>>>>>> master\n  lib.printMenuBottom.10.20.typolink.additionalParams =\n&print=1&no_cache=1\n -[global]\n -\n\nWhy is the [global] line marked for removal? I presume that this\nshould not be the case.\n"}]}