4 ms·

My solution to this is "stacked PRs." main <- PR #1 <- PR #2 <- PR #3 <- PR #4 You can review them in order where the diff view in the PR shows chunks of chan

by Spivak 3y ago

My solution to this is "stacked PRs." main <- PR #1 <- PR #2 <- PR #3 <- PR #4 You can review them in order where the diff view in the PR shows chunks of changes logically grouped together and can be commented on/amended separately. Once everyone is satisfied with the patch set #4 is pulled into #3 is pulled into #2 ... and it shows up in main as 4 commits each with an independent PR history attached.

dfawcus 3y ago
That then becomes a problem if the first PR is accepted and rebased while the others are outstanding. Or at least it is with bitbucket. If the first PR is instead merged, the commits vanish from the start of the sequence in the other PRs.