We are looking to white label and make functionality changes to Upfront for our own solution. The way we were considering going about this is to create a Git repository to store our customised Upfront theme.
In order to preserve our changes when a new version of Upfront is released, we would create a new branch for the new version and then merge it into the master branch (containing our customisations).
I would like your feedback on if this is a reasonable manner in which to do this. Any other related suggestions and/or thoughts would be much appreciated.