Changes between Version 3 and Version 4 of repo/up_old
- Timestamp:
- Dec 5, 2018, 5:38:51 PM (6 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
repo/up_old
v3 v4 16 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. 17 17 18 And for HDS users: 19 {{{ 20 $ svn up $FLAIR_ROOT/flair-hds --accept theirs-full 21 }}}