από 
thk στις 2008-04-11 20:14
λίνουξ
,
προγραμματισμός
at svn land everything is nice except when you start to conflict and see lines thk στις 2008-04-11 20:14
λίνουξ
,
προγραμματισμός
like <<<<<<<<<<<<mineinyourfiles.
then it's time to read this nice manual over svn
If you get a conflict, you need to do one of three things:
-
Merge the conflicted text “by hand” (by examining and editing the conflict markers within the file).
-
Copy one of the temporary files on top of your working file.
-
Run svn revert <filename> to throw away all of your local changes.
$ svn resolved sandwich.txt
Resolved conflicted state of 'sandwich.txt'