conflict on merge?
From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: Sat, 10 Jan 2009 14:39:43 -0600
I've been updating my feature branch every couple of weeks: 'svn up;
Yesterday I tried this, and got a bizarre svn:mergeinfo conflict:
Conflict for property 'svn:mergeinfo' discovered on
Is this conflict something I should accept?
This is an archived mail posted to the Subversion Dev mailing list.