Changes between Version 11 and Version 12 of UmTutorial/vn8.2/CodeChanges


Ignore:
Timestamp:
04/14/16 13:11:57 (4 years ago)
Author:
ros
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • UmTutorial/vn8.2/CodeChanges

    v11 v12  
    373373  * In the working copy directory, type '''fcm merge fcm:um_tutorial_br/dev/ros/vn8.2_um_shell1'''
    374374  * You will be prompted to confirm the merge.  Answer '''y''' to this.
    375   * The conflict with um_shell.F90 will be discovered and you will be prompted to select an option.  Enter '''p''' to select postpone.
     375  * The conflict with um_shell.F90 will be discovered and you will be prompted to select an option.  Enter '''p''' to select postpone.     ''(14/04/16 - Note for UM Training course. Latest version of FCM doesn't give the option '''p''' to postpone it does this by default.  Please then run `fcm status` to see that the file `um_shell.F90` is flagged with the letter C, similar to below. Continue on by running `fcm conflicts` as below.)''
    376376  * You should see that `um_shell.F90` is flagged with the letter C, identifying it as a Conflict
    377377