From: nemo <nemo@ikkoku.de>
To: git@vger.kernel.org
Subject: Conflict removed lines from the change set
Date: Fri, 10 May 2013 14:10:47 +0200 [thread overview]
Message-ID: <1368187847.18427.8.camel@nemo> (raw)
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.
reply other threads:[~2013-05-10 12:16 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1368187847.18427.8.camel@nemo \
--to=nemo@ikkoku.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).