0.035
thk thk Παρ. 11 Απρ. 2008 20:14 tags λίνουξ , προγραμματισμός 0 views
at svn land everything is nice except when you start to conflict and see lines
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.

Finally:
$ svn resolved sandwich.txt
Resolved conflicted state of 'sandwich.txt'