Re: merge disagrees with diff
From: Flemming Frandsen <dren.dk_at_gmail.com>
Date: Fri, 28 Oct 2011 13:02:05 +0200
On Fri, Oct 28, 2011 at 12:58 PM, Andreas Krey <a.krey_at_gmx.de> wrote:
Yes, I have seen conflicts before, that's not what the problem is, I
> (Can't tell without the three versions that have been requested.)
Those versions were sent to the developer who requested them, I'd
The problem is that there are many more changes in the conflicted
-- Flemming Frandsen - YAPH - http://osaa.dk - http://dren.dk/Received on 2011-10-28 13:02:36 CEST |
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.