Resolving Conflicts

http://ariejan.net/2007/07/04/how-to-resolve-subversion-conflicts/

• Scrap your local changes
  
  svn revert MYFILE
svn update MYFILE
• Keep your changes and scrap the other person's
  An ls command in the directory will show 4 files related to the one in conflict:
  • MYFILE – the original with markers
  • MYFILE.mine – your version
  • MYFILE.r5 – the original your worked with
  • MYFILE.r6 – the most update version from your colleague

  Copy your updated version over the original and tell svn you have resolved the conflicts:

  cp MYFILE.mine MYFILE
svn resolved MYFILE
• Merge both versions to a new version
  Manually edit MYFILE. Remove the markers and add whatever you need to add. Then mark the file as resolved:
  svn resolved MYFILE

After resolving the file with any changes, it's recommended that you test those changes first and then commit the new version.