Conflicts (4/5)

• More often than not, one version is just wrong

• SVN knows this, and gives you a few versions to easily choose from: : jmglov@laurana; ls haiku.txt* haiku.txt haiku.txt.mine haiku.txt.r10 haiku.txt.r11

• If you are sure that the version in your working copy is right, simply: cp haiku.txt.mine haiku.txt

• Likewise, if you want to go with the newest revision in the repository: cp haiku.txt.r11 haiku.txt

• Note these are not svn copy commands--no need to involve SVN just yet

Notes: