SVN Conflict Resolution from SCM GUI?
SVN Conflict Resolution from SCM GUI?
- Subject: SVN Conflict Resolution from SCM GUI?
- From: Jim Prouty <email@hidden>
- Date: Mon, 19 Jul 2010 18:20:04 -0700
I was working on our application, and checked out the latest files while I had some modifications not yet checked in, and got an SVN conflict.
I use Xcode 3.2.2 configured to handle SCM for the project's source files.
I could not find anything to mark my edited file (with conflict markers removed) as "Resolved", like I can in svnX.
Must I use other tools to perform such a basic SVN operation, rather than Xcode, or did I miss something?
If not, do later Xcode versions have this feature that 3.2.2 apparently lacks?
========================================================================
Jim "How does it work?" Prouty
Voice: (503) 620-3001, FAX: (503) 620-6754
Makers of IGOR Pro, scientific data analysis and graphing for Mac and PC
http://www.wavemetrics.com
_______________________________________________
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