3 ms·
- you have to chose between easy merge and a clean history I will note that at least with GitHub we’ve been using squash merges for a couples years on a pretty
by charrondev 4y ago
- you have to chose between easy merge and a clean history
I will note that at least with GitHub we’ve been using squash merges for a couples years on a pretty large project and it’s solved this for us.
The devs that want a clean history (like me the project lead). Bisecting is very easy, every commit references a Jira ticket ticket.
People that want to land multiple patches with multiple messages can make multiple pull requests. If you think the changeset is so distinct that I don’t want it to be one commit in a bisect, each changeset deserves its own review.