When does update/merge conflict produce .edited file?
From: Mark Phippard <markphip_at_gmail.com>
Date: Tue, 6 Nov 2012 15:03:32 -0500
Please see this thread from Subclipse mailing list:
Basically, a user has a recipe where an svn update has text conflicts.
It is not clear to me what scenario triggers this, as I could not reproduce it.
Anyway, it seems like the possible bug is that svn resolve does not
-- Thanks Mark Phippard http://markphip.blogspot.com/Received on 2012-11-06 21:04:04 CET
This is an archived mail posted to the Subversion Dev mailing list.