Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

"the subtree" refers to all the code under https://github.com/ACME-Climate/ACME/cime

 

When modifications from within the subtree need be moved back to the fork:

From inside the ACME branch (or master) that contains the changes:

 

Code Block
blogin1[96]: git subtree split -P cime/ -b rljacob/acmemerge-to-cime1
Created branch 'rljacob/acmemerge-to-cime1'
fe8c483486af5b95f24ee64ce45ccb6d6fb6061e
blogin1: git branch
  master
  rljacob/acmemerge-to-cime1
* rljacob/cime-merge