by eptcyka 4 days ago

What if main/master moves in between reviews?

adregan 3 days ago | [-1 more]
eptcyka a day ago | [-0 more]

I know what one does manually, but how does stack make decisions here when there’s a conflict? The reason we use a rebase flow is to allow for adjusting commits that are no longer valid.

jrochkind1 4 days ago | [-0 more]

Before this feature when you were doing it manually, it was a huge problem. One of the points of this feature, is it automates rebasing the whole stack.

tcoff91 4 days ago | [-0 more]

Rebase the stack onto main.

mh2266 3 days ago | [-0 more]

you just rebase it? what's the big deal?

I don't use Github but I do work at one of the companies that popularized this workflows and it is extremely not a big deal. Pull, rebase, resolve conflicts if necessary, resubmit.