|
Version Control with Subversion - Basic Work Cycle - Copying a File Onto Your Working File
Copying a File Onto Your Working File
If you get a conflict and decide that you want to throw
out your changes, you can merely copy one of the temporary
files created by Subversion over the file in your working
copy:
$ svn update
C sandwich.txt
Updated to revision 2.
$ ls sandwich.*
sandwich.txt sandwich.txt.mine sandwich.txt.r2 sandwich.txt.r1
$ cp sandwich.txt.r2 sandwich.txt
$ svn resolved sandwich.txt
[an error occurred while processing this directive]
|
