On Tue, June 13, 2006 9:52 am, Derek Atkins wrote: > This is an svn conflict. It means you changed your local copy and > the copy in SVN changed as well, but incompatibly. Just "svn revert" > to get to the upstream copy, or you can hand-edit the file to fix > the merge problem.
If you do go the hand-editing route, make sure to issue an `svn resolved` to let it know that you've resolved the conflict. -- ...jsled http://asynchronous.org | a=jsled b=asynchronous.org echo [EMAIL PROTECTED] _______________________________________________ gnucash-devel mailing list [email protected] https://lists.gnucash.org/mailman/listinfo/gnucash-devel
