Previous posts

Archives

This blog has moved

For the latest posts, please visit caitlinrowley.com

We apologise for any inconvenience during this transitional stage

 

16 February 2010

 

Notes on resolving SVN conflicts in Aptana Studio

I've had issues for a while with Aptana's lack of documentation but today I finally figured something out. Thanks to a cryptic unexplained, apparently unresolved series of forum posts I've worked out how to deal with subversion conflicts in Aptana, so it seemed kind to post what I found here in case there are other lost souls out there. As it turns out, it was a simple thing, but it helps to know what you're looking for! (oh, and if you're going nuts looking for svn blame in Aptana, try Team > View Annotations) So here's how you resolve your conflict: First up, find the file that the conflict is on - you should be able to see a bunch of temp files beside it which will be used for comparing. Right-click on the file in question (or sometimes you might be able to do this at the level of the project, although for me the option is greyed out). Select Edit Conflicts from the Team menu in the context menu. This will open up a variant of the compare screen which will allow you to import changes from the newer version of the document into your current local one. Clicking on the little box in between two conflicting chunks (one in each document, obviously) will transfer the change from the remote page to the local one. Remote changes or changes that have happened in both will appear in blue. Local changes in red. Anything you don't want to change just leave as is. The little box will remain. You can make text tweaks at the same time. Review all changes to make sure it hasn't done anything mad (it highlighted a block of code for me that had been reduced on the server, but just added in the new line from the server, it didn't replace the whole block for me, so I had to delete the spare definitions manually). Once you're satisfied the conflicts have been correctly resolved, right-click on the filename again, go to Team and this time choose Mark Resolved. The temp files will disappear and the file will be ready for you to commit your changes.

Labels: