New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
fcm-conflicts.pod in branches/UKMO/dev_r5785_SSS_obsoper/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI – NEMO

source: branches/UKMO/dev_r5785_SSS_obsoper/NEMOGCM/EXTERNAL/fcm/lib/Fcm/CLI/fcm-conflicts.pod @ 7773

Last change on this file since 7773 was 7773, checked in by mattmartin, 7 years ago

Committing updates after doing the following:

  • merging the branch dev_r4650_general_vert_coord_obsoper@7763 into this branch
  • updating it so that the following OBS changes were implemented correctly on top of the simplification changes:
    • generalised vertical coordinate for profile obs. This was done so that is now the default option.
    • sst bias correction implemented with the new simplified obs code.
    • included the biogeochemical obs types int he new simplified obs code.
    • included the changes to exclude obs in the boundary for limited area models
    • included other changes for the efficiency of the obs operator to remove global arrays.
File size: 363 bytes
Line 
1=head1 NAME
2
3fcm conflicts (cf)
4
5=head1 SYNOPSIS
6
7Use graphical tool to resolve any conflicts within your working copy.
8
9    fcm conflicts [PATH]
10
11=head1 ARGUMENTS
12
13Invoke a graphical merge tool to help you resolve conflicts in your working copy
14at PATH. It prompts you to run "L<svn|svn> resolved" each time you have resolved
15the conflicts in a text file.
16
17=cut
Note: See TracBrowser for help on using the repository browser.