4 ms·
I think squash is what most workflows and teams actually want. Rebase doesn’t scale well with the team size and merge makes rollbacks somewhat unwieldy and hist
by booi 4y ago
I think squash is what most workflows and teams actually want. Rebase doesn’t scale well with the team size and merge makes rollbacks somewhat unwieldy and history messy.
- aditya286 4y agoMy team uses squash + rebase. We wanted to have a linear clean commit history and ability to rollback. But in a team of 8 When 2 pull requests are generated at the same time and if I approve the oldest first then latest needs to rebase again as the history has changed. We solve this by notifying the team that pr is generated or approved. But its not scalable. Is there any solution for this?