...
"the subtree" refers to all the code under https://github.com/ACME-Climate/ACME/cime
...
Initial add of CIME to ACME:
This was done once.
ACME was freshly cloned (from Sept 3, 2015 head: https://github.com/ACME-Climate/ACME/commit/c2b9b202f95cba910b72a53acc4c747beac316a7 and a remote for the ACME cime fork was added:
...
- move model components to their cime locations
- add cime build capability
- remove the models directory
- add ability to build component models with cime.
Add of CIME5 to ACME:
The existing cime was removed with git rm and the above repeated with
git remote add esmcicime git@github.com:ESMCI/cime.git
When modifications from within the subtree need be moved back to the fork:
...
| Code Block |
|---|
blogin1: git checkout -b rljacob/merge-from-acme1 Switched to a new branch 'rljacob/merge-from-acme1' blogin1]: git branch master rljacob/acmemerge-to-cime1 rljacob/cime-merge * rljacob/merge-from-acme1 blogin1[173]: git status On branch rljacob/merge-from-acme1 Untracked files: (use "git add <file>..." to include in what will be committed) components/mpas-o/ nothing added to commit but untracked files present (use "git add" to track) blogin1[174]: |
Now merge onto the branch you just created the changes that are on the branch created by the subtree split (the first command above).
...
You can now push the branch containing the code for the external and merge it to master using the external's procedures.
...