On Mar 15, 2016, at 9:22 AM, James wrote:
> Something wrong after I commit my merge from a branch to trunk. Now the
> version number is 689 and the previous is 687 in the trunk tree.
> I followed the online suggestions did the following from my trunk working
> copy directory:
> svn up
> svn mer
Something wrong after I commit my merge from a branch to trunk. Now the version
number is 689 and the previous is 687 in the trunk tree.I followed the online
suggestions did the following from my trunk working copy directory:svn up
svn merge -r 689:687 .
and svn up
svn merge -c -687 .
both above
