Thank you for suggesting this. When you say "switched to rebasing", can you explain exactly how you do that, like what steps and what Git commands? And how that makes sure your Dreamhack is up-to-date? I'm certainly willing to try it but I don't understand your suggestion well enough to follow it yet.