Your Ad Here

advanced code snippet search

Posted By

daninfpj on 07/19/11


Tagged

svn conflict resolve


Versions (?)

SVN Resolve

 / Published in: SVN
 

URL: http://stackoverflow.com/questions/2406469/svn-remains-in-conflict

Expand | Embed | Plain Text 
  1. svn remove --force filename
  2. svn resolve --accept=working  filename
  3. svn commit

Report this snippet  

You need to login to post a comment.