On Fri, Oct 28, 2011 at 12:58 PM, Andreas Krey <a.k...@gmx.de> wrote: > You didn't get a clean merge; you got a conflict. When you get a conflict, > it is your job to look at what you merged and at the proposed result, > and resolve it yourself.
Yes, I have seen conflicts before, that's not what the problem is, I know how to handle conflicts. > (Can't tell without the three versions that have been requested.) Those versions were sent to the developer who requested them, I'd rather not have them on the public mailing list. The problem is that there are many more changes 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/
