News for hackers. Stuff that matters.

A comment on Two Years of Squash Merge (2019).

Re:Two Years of Squash Merge (2019) by wbronchart on Friday April 30, 2021 @05:48PM (#26999806)
I love clean linear history, but I don't like squash&merge, and I don't like the other options that the github interface gives you either.

Plug: I wrote a script recently that merges github pull requests but preserves linear git history (basically, rebase + merge)

https://pypi.org/project/git-pr-linear-merge/

[ Parent | on HN ]
Re:Two Years of Squash Merge (2019) by epage on Friday April 30, 2021 @07:19PM (#27000822)
This is baked into Azure DevOps, I'm surprised they haven't pulled it over into GitHub.
[ Parent | on HN ]
Re:Two Years of Squash Merge (2019) by wbronchart on Friday April 30, 2021 @09:13PM (#27001873)
Yeah, you'll find endless threads on github issues of people complaining Github doesn't have this yet. It's a real pain
[ Parent | on HN ]