Re:Two Years of Squash Merge (2019)
by u801e on Friday April 30, 2021 @11:23PM
(#27002758)
> You will not be able to merge a PR that tries to get more than one commit onto master
What value does the merge commit in the PR provide if a PR only has a single commit? Couldn't you essentially halve the number of commits in the commit history by amending the single PR commit message to contain the text that the merge commit will contain anyway?
Re:Two Years of Squash Merge (2019)
by tharkun__ on Saturday May 01, 2021 @02:13PM
(#27008452)
In case it wasn't clear from my post, I am very all over the place with the word 'merge'. I usually use it to describe the concept. We don't ever have actual merge commits. We merge by rebasing and that then makes the 'merge' just a fast forward.
What value does the merge commit in the PR provide if a PR only has a single commit? Couldn't you essentially halve the number of commits in the commit history by amending the single PR commit message to contain the text that the merge commit will contain anyway?