Problems during merge
From: Christoph Bartoschek <bartoschek_at_or.uni-bonn.de>
Date: Wed, 10 Feb 2010 13:59:17 +0100
Hi,
after a merge with conflicts I completely wrong conflict markers:
======================= inv_merge.C =============================
_cur.sinks(to_polarity(other)).append(csol.sinks());
Time slew_limit =
In my working copy there is:
======================= inv_merge.C.working ======================
_cur.sinks(to_polarity(other)).append(csol.sinks());
Time slew_limit =
The right part only differs in an empty line:
=============== inv_merge.C.merge-right.r13821 ===================
Time slew_limit =
In the left part we have:
=============== inv_merge.C.merge-left.r13820 ===================
TimePair slew_limit =
I would have expected that I see the code of the left part in the merge view
What is going wrong here?
Christoph
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.