Comment by nerdponx

I wonder if a revision control system like Git obviates this problem, so long as you make clean patch merges.