svnX and file conflicts
svnX is an open source subversion client (svn) for Mac OS X. It requires the installation of the svn command line back end (Leopard includes it already). When it is presented with file conflicts of binary files, it might not be obvious how to resolve them. In short, pressing ‘Resolved’ retains the local version, pressing ‘Revert’ retains the remote version.