Changes between Version 2 and Version 3 of repo/up_old
- Timestamp:
- Apr 10, 2017, 5:43:09 PM (8 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
repo/up_old
v2 v3 7 7 $ svn up $FLAIR_ROOT/flair-src 8 8 }}} 9 If you are an hds user: 10 To update your local repositories: 11 {{{ 12 $ svn up $FLAIR_ROOT/flair-hds --accept theirs-full 13 }}} 14 9 15 10 16 In some cases, you can have a conflict between local file and remote files. This can happen if you [wiki:compile_all recompiled all] for example. In this case, and if you are sure you can discard your changes, answer ''tf'' to the conflict question.