rodluger

Migration to GitHub

Create the empty repo vplanet-dev on GitHub. Then, on your local machine, cd into the vplanet directory and run

git remote rename origin bitbucket
git remote add origin https://github.com/VirtualPlanetaryLaboratory/vplanet-dev.git
git push origin master
git remote rm bitbucket

rodluger

Working with a public repo and a private repo

We currently have a public vplanet repo and a private vplanet-private repo. Here's what we decided our workflow should look like:

All development is done on the (non-master) branches of vplanet-private and synced to master via pull requests. When a change is ready to be incorporated into the current released version of the code, we go to our local clone of the public vplanet repository and pull from master on vplanet-private to local dev. Then, on the GitHub UI, we issue a pull request for master on vplanet.

Setting up tracking on your local machine