Changes between Version 2 and Version 3 of troubleshooting


Ignore:
Timestamp:
Apr 21, 2016, 12:28:17 PM (9 years ago)
Author:
Sanahuja Guillaume
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • troubleshooting

    v2 v3  
    2525If you have changed something on the versioned files and if these changes are not committed, you will have a conflict when updating these files (with ''svn up command''). This can occur when you recompiled [wiki:compile_all all stuffs].
    2626
    27 So be sure that you get the version of the files from the server when you update the repositories. Otherwise, you will stay with the older versions. In doubt you can erase your local repositories and [wiki:repo/sync checkout them again], but be sure to not erase your personal work.
     27So be sure that you get the version of the files from the server when you update the repositories by answering ''tf'' to the conflict question. Otherwise, you will stay with the older versions. In doubt you can erase your local repositories and [wiki:repo/sync checkout them again], but be sure to not erase your personal work.
    2828
    2929One other solution is to [wiki:compile_all compile all] again after the update.