How to resolve conflicts in xcode 4 when using SVN?

Question

On trying to update my working copy, Xcode indicates that there are certain conflicts. A new screen comes up which shows my local file on the left and the server code on the right highlighting whatever conflicts are present. What I'm doing at this stage is, reviewing my code and make necessary changes using this tool: enter image description here

When I'm finally done reviewing and making changes to my code as necessary, I'd like to update my project with the changes I've made. However the update button at the bottom is still disabled. What is it that I'm missing here? How do I convey to Xcode that I'm done making changes and it may update the project?

Anil · Accepted Answer · 2013-02-11 21:06:16Z

3

After making changes to your code, you have to right click your file and select 'resolve conflicts.'

I hope this may help.

edited Feb 11, 2013 at 21:06

Anil

2,5516 gold badges33 silver badges46 bronze badges

answered Jun 2, 2011 at 4:41

Mobile Developer iOS Android

6,0045 gold badges39 silver badges58 bronze badges

Sign up to request clarification or add additional context in comments.

2 Comments

Atul Goyal Over a year ago

I don't see any such option. What am I missing?

Ab'initio Over a year ago

@AtulGoyal try by installing command line tools (Xcode->Preferences->Downloads->instll command line tools).

Bolek Tekielski · Accepted Answer · 2011-06-02 05:53:40Z

3

You have click on a very line that shows conflict and resolve it explicitly by choosing either left or right version. After that update button will be enabled.

answered Jun 2, 2011 at 5:53

Bolek Tekielski

1,2142 gold badges11 silver badges25 bronze badges

Comments

Kate Gregory · Accepted Answer · 2012-09-30 14:20:54Z

2

First update your working copy to repository. If you are not finding any conflicts then commit the code. But if you have any conflicts, then those conflicts are indicated by red color. Click on that file (to see the conflicts use (cmd+d)), then click on resolve button to find the conflicts. After that there are some options that you want to select the exact code you want by choosing the options at the bottom: left, right, left right first, right left first,neither.

Then select the required code and click resolved button. If your repository copy is correct then Go to resolve... >Identify conflicts... >Go to differences... >Resolve them. If your working copy is correct then Go to resolve... >Identify conflicts... >Resolve them.

edited Sep 30, 2012 at 14:20

Kate Gregory

19k8 gold badges60 silver badges87 bronze badges

answered Jan 6, 2012 at 9:41

Srinivas

4001 silver badge11 bronze badges

Collectives™ on Stack Overflow

How to resolve conflicts in xcode 4 when using SVN?

3 Answers 3

2 Comments

Comments

Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

3 Answers 3

2 Comments

Comments

Comments

Your Answer

Sign up or log in

Post as a guest

Related