Do you think that works any better if you're using merges Vs rebasing though? If the problem is that you urgently need some small fix in an otherwise broken br

Do you think that works any better if you're using merges Vs rebasing though? If the problem is that you urgently need some small fix in an otherwise broken branch, you can always just cherry-pick that across to your own fresh pr.