Comments on: Taming of the Subversion, a SVN primer; part 2 http://www.turnleafdesign.com/taming-of-the-subversion-a-svn-primer-part-2 Ramblings of a junior developer Mon, 23 Aug 2010 13:04:02 +0000 hourly 1 http://wordpress.org/?v=3.0.1 By: Mark Phippard http://www.turnleafdesign.com/taming-of-the-subversion-a-svn-primer-part-2/comment-page-1#comment-110 Mark Phippard Thu, 15 Oct 2009 15:41:43 +0000 http://www.turnleafdesign.com/?p=230#comment-110 You can edit conflicts graphically by using Team > Edit Conflicts. I personally prefer to use the editor and just remove the code I do not want (as you did). However to tell SVN you have resolved the conflict, you should do Team > Mark Resolved. Do not just delete the files. This option also gives you some resolve options, such as taking one version of the file or another -- useful for binary files. You can edit conflicts graphically by using Team > Edit Conflicts. I personally prefer to use the editor and just remove the code I do not want (as you did).

However to tell SVN you have resolved the conflict, you should do Team > Mark Resolved. Do not just delete the files. This option also gives you some resolve options, such as taking one version of the file or another — useful for binary files.

]]> By: Taming of the Subversion, a SVN primer; part 1 | Turnleaf Design http://www.turnleafdesign.com/taming-of-the-subversion-a-svn-primer-part-2/comment-page-1#comment-90 Taming of the Subversion, a SVN primer; part 1 | Turnleaf Design Thu, 15 Oct 2009 04:33:00 +0000 http://www.turnleafdesign.com/?p=230#comment-90 [...] Part two has been posted, check it out [...] [...] Part two has been posted, check it out [...]

]]>