Hacker News new | ask | show | jobs
by Quenty 1817 days ago
Azure DevOps has this concept, it’s called “semi-linear merge” where it will rebase your PR on top of the branch being merged into, but then create a 2 parent merge commit with the PR comments and text to merge the content, letting you easily reconstruct what changes were made in one PR, while also preserving commit history and keeping the history clean overall.
1 comments

This is what GitHub used to do, before they changed it to the squash model.