Re: SVN Conflict Resolution from SCM GUI?
Re: SVN Conflict Resolution from SCM GUI?
- Subject: Re: SVN Conflict Resolution from SCM GUI?
- From: Jim Prouty <email@hidden>
- Date: Tue, 20 Jul 2010 10:57:41 -0700
On Jul 19, 2010, at 6:56 PM, David Dunham wrote: On 19 Jul 2010, at 18:20, Jim Prouty wrote: I could not find anything to mark my edited file (with conflict markers removed) as "Resolved", like I can in svnX.
SCM > Resolved
Well, that's embarrassing, how *did* I overlook that?
Oh, I know, I expected a right-click of the file in the SCM Results window to give that option, too.
Thanks for pointing it out.
========================================================================
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