b (revision 2)
@@ -3,6 +3,7 @@
3
4
5
+5 and a quarter
5 and a half
6
7
The conflict in a ends up being:
1
2
3
4
5
<<<<<<< .working
===
5 and a quarter
5 and a half
>>>>>>> .merge-right.r2
6
7
8
9
10
I'm comforted that this only happens when there is a conflict, but
it's still terribly confusing for people and I wonder if trying to
apply the diff (as reported by svn diff) would lead to a less
confusing conflict as you would only have to deal with the actual
change you wanted to merge rather than the entire
Thank you all for your time.
--
Flemming Frandsen - YAPH - http://osaa.dk - http://dren.dk/
ightened.
--
Flemming Frandsen - YAPH - http://osaa.dk - http://dren.dk/
ges in the conflicted
block than the diff suggested, iow: svn merge tried to add more lines
than svn diff said it would.
--
Flemming Frandsen - YAPH - http://osaa.dk - http://dren.dk/
y time I've seen the problem manifest, but the
circumstances where similar, in the other case another developer was
trying to merge a change from version-1 to version-2, he too got extra
changes in his merge target.
--
Flemming Frandsen - YAPH - http://osaa.dk - http://dren.dk/
home-compiled 1.7.1, the server runs ubuntu server 10.10.
Clients are mostly linux with mostly 1.6.12, but there are windows
machines and 1.7.1 clients as well.
I did not find any --dont-merge-random-crap option, so I'm very confused.
--
Flemming Frandsen - YAPH - http://osaa.dk - http://dren.dk/
