We would all benefit from syncing from the master repo, https://github.com/respec/HSPsquared, anytime it changes and before we do a round of work.
We're all ideally following the collaborative feature branch workflows described in respec#30.
Look for new commits from RESPEC at https://github.com/respec/HSPsquared/network.
There are two ways of keeping our repo synced.
- Use GitHub web application to create a pull request.
- This is easy and allows for a nice review step before merging.
- It always creates a merge commit.
- The default is to request that RESPEC pull from our repo, whereas we want the opposite direction for a sync, to pull into our repo from RESPEC. So configure the GitHub UI to look like this:

- Use the command line to do a
git merge upstream/master
cc: @rheaphy
We would all benefit from syncing from the master repo, https://github.com/respec/HSPsquared, anytime it changes and before we do a round of work.
We're all ideally following the collaborative feature branch workflows described in respec#30.
Look for new commits from RESPEC at https://github.com/respec/HSPsquared/network.
There are two ways of keeping our repo synced.
git merge upstream/mastercc: @rheaphy