"the fork" refers to ACME's fork of CIME: https://github.com/ACME-Climate/cime
"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:
blogin1: 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