Re: roll back,merge and tree confilct

On Sun, Apr 10, 2011 at 10:00 PM, Gu <gshy2014_at_gmail.com> wrote:
> Hi,
>    I need to roll back to a particular version. I read this post
> http://jacwright.com/blog/75/how-to-roll-back-changes-using-subversion/
> 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.

Can you show us the command you used and the exact error you got?

Normally, doing a rollback via Merge doesn't cause any issues unless
you're attempting to roll back something other than the previous
revision.

-- 
David Weintraub
qazwart_at_gmail.com