title: How to resolve conflicts in xcode 4 when using SVN?
body: <p>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: 
  <img src="https://i.stack.imgur.com/5hBQZ.png" alt="enter image description here"></p>
  
  <p>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?</p>