Today it was my turn to merge in some bug fixes and updates into the current branch. And we had a conflict on an image file. What to do? Well, if you want to keep the incoming change then use ‘svn resolved’ or if you like the old one then ‘svn revert’ Yep, I totally knew that and didn’t spend an hour looking around the internet only to find a solution that only applied to svn 1.5 which doesn’t work with svn 1.4

Merging sure is fun.