@raboof The way I see it juggling all those branches as one merged branch makes you aware of the conflicts and can inform your decisions on what's a truly independent change and belongs in its own PR. =)