title: Trying to commit changes subversive
body: <p>I am trying to commit changes that I have made om a project but get the following message.</p>
  
  <p>Some of the selected resources are conflicting. You should resolve the conflicts before commiting.</p>
  
  <p>Any advice perhaps as to how to resolve this so that I can commit?</p>
  
  <p>Kind regards</p>