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

roll back,merge and tree confilct

From: Gu <gshy2014_at_gmail.com>
Date: Sun, 10 Apr 2011 21:00:20 -0500

   I need to roll back to a particular version. I read this post
It tells me to use merge to roll back. However, I failed due to a so-called
tree conflict. I don't know how to solve that problem.
I tried svn update and update seems successful. But after svn update, I
still cannot use svn merge to roll back.,
Error: Attempt to add tree conflict that already exists.

Thank you.
Received on 2011-04-11 04:00:55 CEST

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.