Conflicts (5/5)

When you have fixed the file one way or another, be sure to let SVN know: : jmglov@laurana; svn resolved haiku.txt Resolved conflicted state of 'haiku.txt' : jmglov@laurana; ls haiku.* haiku.txt
SVN cleans up the temporary but oh-so-helpful files, and you are ready to commit: svn commit \ -m 'added a fancy border to the title' \ haiku.txt

When you have fixed the file one way or another, be sure to let SVN know: : jmglov@laurana; svn resolved haiku.txt Resolved conflicted state of 'haiku.txt' : jmglov@laurana; ls haiku.* haiku.txt