This would probably be the way that has the least hands on code editing. Of course, you will have to test and review after each upgrade to make sure that your changes were not overwritten plus git will often make you reset your code before pulling an updated version if there is a conflict.
Themes
Incorporating core moodle functionality into theme
This discussion has been locked so you can no longer reply to it.