Hey @mikesource - your current approach is probably as good as any. I suspect that most people don’t generally update their Sage themes from upstream unless there’s a specific change or fix they need to incorporate. Sage isn’t really designed that way (see Keeping Sage Updated). Doing a merge, manually copying changes, or cherry picking commits are likely the best options.