-bytes branch reports bogus conflict that trunk doesn't
From: Daniel Shahaf <danielsh_at_apache.org>
Date: Sun, 2 Jan 2011 20:36:16 +0200
Johan,
I saw your sync merge, so I ran 'svn up' with intent to rebuild. When
Furthermore, the conflict resolution (a) marked all the head of the file
I realize that (a) is an outstanding issue (discussed in another thread
Daniel
|
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.