Some forks are using a nice patch based system: see how the Zen browser is built for instance (https://github.com/zen-browser/desktop/). I think that's a better model than merging upstream updates into your own branch.