Keeping your environment in sync

When you create your local environment, the first thing you do is fork the relevant repos. This takes a snapshot of those repos at that moment and copies them to your account so you can build on them. But if those repos change afterwards, say, because someone else was working on them, your "snapshot" forks are no longer up-to-date. Best practice suggests syncing your forks every time you begin work.

The personnel repo includes a script to do this for all 3 repos. First, make sure you haven't changed the branch in any of the repos (personnel-app and personnel-api should be on master and vanilla should be on 29th-extensions-*), otherwise git checkout the branch. Then from the personnel/ directory, run

$ source sync.sh

This is just a shortcut for going into each repo and running

$ git fetch upstream
$ git merge upstream/master   (or upstream/29th-extensions-*)

Note that this only updates your local environment. If you have multiple development environments, you should go into each of your 3 repos and git push them to source control.