|
|
|
|
|
|
by throwaw20221107
1311 days ago
|
|
|
>merging a sequence of PRs from same branch is bad if you squash For me in this scenario, merging `main` w/ squash commit back into PR2 branch after PR1 gets merged works here. As an aside — if code review is the bottleneck, it's probably not a huge investment to do some git fenangling to get the above to merge cleanly. But I don't see how this use case is a dealbreaker or even specific to squash...? Won't you have to incorporate/merge other devs' changes to `main` back into PR2 anyhow, regardless of whether PR1 was a squash, rebase, or full history? |
|
|