Hi,
Just wondering how I am able to resolve this, see below (ie resolve
files that are in conflict, as I am not the only one working on this
project).
Commit failed (details follow):
Aborting commit: '/Applications/MAMP/htdocs/countryhomeideas/sites/all/
A conflict occurs when you update a file, and changes from the repository
conflict with changes local to your working copy. (Incidentally, this can
happen even with only one person working in a repository; I've occasionally
made changes to fix different things in different working copies, then
On Sun, 13 Dec 2009 04:05:10 +0100, Joe Wicentowski joe...@gmail.com
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
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 if
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
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
Add my +1. I would love an option to launch an automatic 3-way merge
with Araxis, FileMerge, etc.
Many thanks for a great app that's a joy to use.
Trevor
On Aug 14, 11:16 am, Quinn Taylor quinntay...@mac.com wrote:
I've never seen SVN produce files with the names you used... I'd
expect to
I think svn changed the filename suffixes of conflict files around 1.5
or maybe 1.6. Newer versions use the left/right terminology.
On Aug 14, 12:16 pm, Quinn Taylor quinntay...@mac.com wrote:
I've never seen SVN produce files with the names you used... I'd
expect to see something like this:
I wrote up some directions with screenshots on how to use Filemerge
here:
http://daveyshafik.com/archives/681-resolving-svn-conflicts-with-filemergeapp-on-os-x.html
- Davey
On Aug 13, 2009, at 06:11 PM, Appfire wrote:
I am trying to understand how can I use filemerge to resolve conflicts
