Two Years of Squash Merge (2019)

Re:Two Years of Squash Merge (2019) by pizza234 on Friday April 30, 2021 @03:52PM (#26998438)

> - Services like GitHub allow you to restore the original branch, so you never actually lose history. So I don't see any major drawbacks of squashing on merge.

There's definitely a drawback, and it's bisecting, which is actually a big deal.

Bisecting allows in a semi-automated (depending on the issue) bisecting what otherwise can be a large diff.

But of course, it requires a disciplined history - otherwise, bisecting just won't work.

[ Parent | on HN ]

Re:Two Years of Squash Merge (2019) by marcinzm on Friday April 30, 2021 @05:59PM (#26999928)

Can't you just bisect twice. Once to find the PR and a second time within the PR's branch?

[ Parent | on HN ]

Re:Two Years of Squash Merge (2019) by pizza234 on Sunday May 02, 2021 @06:07AM (#27013827)

AFAIK, if you squash merge, the SCM (intended as the repository, both local and remote) will keep only a single commit; the commits breakdown will be in GitHub's (intended as a service) history.

[ Parent | on HN ]