Warning: file_put_contents(sites/nerkn/cache/containers/queryList/select_s_from_pages_where_pageTypeproject1.file.php): failed to open stream: No such file or directory in /home/erkintek/nerkl/inc/classBasic.php on line 247

Warning: file_put_contents(sites/nerkn/cache/containers/queryList/select_s_from_pages_where_pageTypeproject1.file.php): failed to open stream: No such file or directory in /home/erkintek/nerkl/inc/classBasic.php on line 247

Warning: file_put_contents(sites/nerkn/cache/containers/queryList/select_s_from_pages_where_pageTypeknowlagebase1.file.php): failed to open stream: No such file or directory in /home/erkintek/nerkl/inc/classBasic.php on line 247

Warning: Cannot modify header information - headers already sent by (output started at /home/erkintek/nerkl/inc/classBasic.php:247) in /home/erkintek/nerkl/inc/layout.php on line 227
svn conftlict options

Nerkn

Php developer, drupal, html, css, jquery, ajax, javascript
s:147:"

svn conftlict options

It's very confusing when you face with conflict menu in command line.


  (e)  edit             - change merged file in an editor
  (df) diff-full        - show all changes made to merged file
  (r)  resolved         - accept merged version of file

  (dc) display-conflict - show all conflicts (ignoring merged version)
  (mc) mine-conflict    - accept my version for all conflicts (same)
  (tc) theirs-conflict  - accept their version for all conflicts (same)

  (mf) mine-full        - accept my version of entire file (even non-conflicts)
  (tf) theirs-full      - accept their version of entire file (same)

  (p)  postpone         - mark the conflict to be resolved later
  (l)  launch           - launch external tool to resolve conflict
  (s)  show all         - show this list

";