How to set up WRF-Fire-merge tracking branches

From openwfm
Revision as of 19:55, 3 February 2019 by Jmandel (talk | contribs)
(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)
Jump to navigation Jump to search

To set up tracking branches:

git clone ssh://git@github.com/openwfm/WRF-Fire-merge.git
cd WRF-Fire-merge/
git remote add wrf-fire-git ssh://git@github.com/openwfm/wrf-fire.git
git remote add WRF-git	ssh://git@github.com/wrf-model/WRF.git
git checkout remotes/wrf-fire-git/master
git checkout -b wrf-fire-track/master
git push -u origin wrf-fire-track/master:wrf-fire-track/master

To update:

cd ~/WRF-Fire-merge
git fetch wrf-fire-git
git checkout wrf-fire-track/master
git merge remotes/wrf-fire-git/master
git push -u -f origin wrf-fire-track/master:wrf-fire-track/master
git fetch WRF-git
git checkout master
git merge remotes/WRF-git/master
git push -u -f origin master:master
git checkout develop
git merge remotes/WRF-git/develop
git push -u -f origin develop:develop