matthiasblaesing commented on PR #8228: URL: https://github.com/apache/netbeans/pull/8228#issuecomment-4490102959
> > Unless I'm mistaken nothing in here touches the sig files (the most probable cause for merge conflicts after a release), so my perspective this can be merged. > > Should I squash everything to 1 commit? Good question. I depends on whether the commit individually make sense or should be separated. For example if code cleanup and feature work are both present in a PR I prefer separate commits, so that later it is clear what was the intention. On the other hand a single commit is easier to remove should it become necessary. I thing there are sensible options for squashing. [57b9a65](https://github.com/apache/netbeans/pull/8228/commits/57b9a65a6a42b8e5abe6527fe37e2e7807c4c48f) looks like a candidate to keep separate, but could also be part of a single big change commit. Does this help you? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- 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
