Having [origin pull from the canonical copy and push to your fork](https://github.com/martinthomson/i-d-template/blob/master/doc/TIPS.md#when-creating-pull-requests-on-another-repository) makes things a LOT easier to manage.
Having origin pull from the canonical copy and push to your fork makes things a LOT easier to manage.