e3sm_cime_merge

e3sm_cime_merge is a script in CIMEROOT/scripts/Tools.

$ ./e3sm_cime_merge --help
usage: 
e3sm_cime_merge [--verbose]
OR
e3sm_cime_merge --help

A script to merge ESMCI's cime development and make it into a PR for E3SM

positional arguments:
  repo           Location of repo to use, default is based on current location
                 (default: None)

optional arguments:
  -h, --help     show this help message and exit
  -d, --debug    Print debug information (very verbose) to file
                 /Users/sacks/cime/scripts/Tools/e3sm_cime_merge.log (default:
                 False)
  -v, --verbose  Add additional context (time and file) to log messages
                 (default: False)
  -s, --silent   Print only warnings and error messages (default: False)
  -r, --resume   Resume merge after fixing conflicts (default: False)
  -a, --abort    Abort merge (default: False)
  --squash       Do the merge as squashy as possible (default: False)
  --auto-conf    Try to automatically resolve conflicts (default: False)