[GUSDEV] resolving conflicts in svn

[Steve F. <sfi...@pc...>]

folks-

in svn, unlike cvs, when you have resolved the conflicts in a file you 
must tell svn that:
  
   svn resolve myfile.java

steve