If you renamed it in Finder, rename it again back to what it was and then  
use Version's rename functionality. Versions doesn't have a "detect rename  
/ move" feature yet, so you can't really do stuff like this through the  
Finder.


-Asbjørn



On Mon, 07 Dec 2009 23:28:43 +0100, Andrew <[email protected]> wrote:

> Hi,
>
> I'm new to SVN, but I've been able to get Versions working with a
> Beanstalk repository.
>
> Everything has been going fine, until now:
>
> I have created what SVN is calling a 'tree-conflict'; (I renamed a
> folder)
>
> and I can't seem to figure out how to fix it.
>
> I know there are 'merging' and 'resolving' functions for SVN but it
> won't let me 'resolve' this one; and I can't find anything about
> 'merging' in Versions altogether.
>
> Help?
>
> --
>
> You received this message because you are subscribed to the Google  
> Groups "Versions" group.
> To post to this group, send email to [email protected].
> To unsubscribe from this group, send email to  
> [email protected].
> For more options, visit this group at  
> http://groups.google.com/group/versions?hl=en.

--

You received this message because you are subscribed to the Google Groups 
"Versions" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en.


Reply via email to