Re: svn compare using FileMerge not storing to expected location
Re: svn compare using FileMerge not storing to expected location
- Subject: Re: svn compare using FileMerge not storing to expected location
- From: Andrew Pontious <email@hidden>
- Date: Sun, 12 Nov 2006 00:39:28 -0800
On Nov 11, 2006, at 2:42 AM, Michael Siek wrote:
probably there is a obvious solution for this but i didnt find it...
Subversion 1.4 (via svn:// protocol) and XCode 2.4.1 are up and
running.
Updating from and comitting to the repository work fine.
When i have to solve a conflict between my current working copy file
and
a repository version FileMerge is in use to merge the modifications.
But when pressing "save merge" the merge result it asks me for a file.
Why that? I would expect that it will overwrite my working copy file
by
default...
This is a known issue.
I'm sorry that we don't have a solution for you at the moment.
-- Andrew
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden