Re: Resolving Conflicts or Merging in Versions

2009-12-13 Thread Asbjørn Ulsberg
On Sun, 13 Dec 2009 04:05:10 +0100, Joe Wicentowski wrote: >> Versions doesn't have a "detect rename / move" feature yet > > Wow - that would be a great feature. Indeed it is. SmartSVN has this and although everything in SmartSVN looks like it's been thrown together by a two year old and his

Re: Resolving Conflicts or Merging in Versions

2009-12-12 Thread Joe Wicentowski
Asbjørn, > 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. Wow - that would be a great feature. Do you know i

Re: Resolving Conflicts or Merging in Versions

2009-12-07 Thread Asbjørn Ulsberg
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 wrote:

Resolving Conflicts or Merging in Versions

2009-12-07 Thread Andrew
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 'resolv