On Tue, 23 Feb 2021 at 07:24, Jaroslav Tulach <[email protected]> wrote: > I am not huge fan of "squashing" in general, but I can live with it from time > to time. However in the [PR-2761](https://github.com/apache/netbeans/pull/ > 2761) I tried my best to let the commits speak for themselves and explain what > is their purpose for example when using `git blame`. ... > Do we really want to squash #2761 into a single commit? Do we want to keep at > least some (of the "!") commits? Do we leave it as it is and merge?
I think you make a good argument for not squashing, at least in this case! On a tangential note, and somewhat related to git blame, if you do squash at all, it would be good to do via the PR, or in such as way that GitHub picks up the fact the PR is merged. I'm planning to pick up on that point when 12.3 is out of the way. Geertjan and I had this issue again where PRs have been squashed and merged directly into master and the PR manually closed - it makes it far more difficult to map back to what PRs have been merged during a release cycle and the discussions that have gone on around them. Best wishes, Neil --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
