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

Re: How to recover from a failed update/merge?

From: Nathan Hartman <hartman.nathan_at_gmail.com>
Date: Thu, 13 Aug 2020 19:47:55 -0400

On Thu, Aug 13, 2020 at 5:47 PM Bo Berglund <bo.berglund_at_gmail.com> wrote:

> On Mon, 10 Aug 2020 09:52:51 -0400, Nathan Hartman
> <hartman.nathan_at_gmail.com> wrote:
>
> >Again, since a revert cannot be undone, always be careful with "svn
> revert"
> >especially with "-R" (recursive)!!
>
> Thanks!
> I used TortoiseSVN to revert the 7 changed files and then I did an
> update and got the latest revision without the conflicts popping up!
>
> I did not need the recursion because it was only files from a single
> dir that were compromised.

Glad it helped. Thanks for confirming it solved the problem.

Cheers,
Nathan
Received on 2020-08-14 01:48:14 CEST

This is an archived mail posted to the Subversion Users mailing list.