Staying up-to-date with Sage 9 changes

[ben]

This should help

Best practices to update Trellis

This may seem like a bit of a simpleton-ish question, but what is the best practice to update Trellis with the latest upstream updates from the developers? I cloned Trellis and followed the example project setup a site, and that is in a private GitHub repo now. Since I removed the .git folders as the docs suggest, it doesn’t have an upstream tie anymore. I need to get some updates from the upstream development into mine to fix some issues that have been resolved in newer code. What’s the best wa…