[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: try to revert from a bad merge but get error result

From: Ryan Schmidt <subversion-2016_at_ryandesign.com>
Date: Thu, 17 Mar 2016 10:53:18 -0500

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 merge -r 689:687 .
>
> and
> svn up
> svn merge -c -687 .
>
> both above give me an error result:
> svn: E155035: Can't merge into conflicted node '/locationToAFile/fileName.java'
>
> search online but cannot find direct answer for this. can you tell me how to resolve above error and let me continue the revert?

Well before you do anything else, you need to resolve the conflict on /locationToAFile/fileName.java.
Received on 2016-03-17 16:53:33 CET

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.