In reply to Neo.

If only there was a way to downvote comments here :( this idea is like -1000.

At the min, use git. Will not solve the fundamental problem of upgrading the master theme with ease, but at least you will be able to automate the merge process.