svn resolve --accept theirs-fault all/all/all/sheeze.phtml