How to pull/merge updates from Trellis remote (master) in case of major changes?

[richardwilis]

The subtree method as detailed here works for me.