Merge, reintegrate, and merge with tree conflicts
From: James Hanley <jhanley_at_dgtlrift.com>
Date: Fri, 22 Feb 2013 14:15:06 -0500
We are seeing merge tree conflicts where I believe svn is not working
The problem can be reproduced by creating a branch, add and committing
I've included the following script to regenerate the issue two
Any advice?
|
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.