@henrywright said:
this idea wouldn't work if > 1 line change
I was referring to my idea of making a manual 1-line change to the theme core at the point of each upgrade. That would avoid you having to use Git to merge in new commits each upgrade.
Again, although not a clean way of working, it sounds like it'll be easier than what you're currently doing.