vieiro commented on PR #5617: URL: https://github.com/apache/netbeans/pull/5617#issuecomment-1462670939
> I have no strong feelings here. We should know how to handle merges. All committers were informed multiple times, that the github GUI is a flaky tool, that might or might not skrew your merge and might have less sane defaults than the git CLI tools. I have more trust in my manual merge+force push foo, than on github, but others can see this differently. I don't think the problem is committers knowing how to handle merges, nor how to squash stuff. I think the problems are: - that the Github's merge button has three very different functions in one single button (that's indeed a bad UI design) and it's easy to choose the wrong one if you're distracted. Accidents happen! - github did some weird stuff with author names and may be a problem to track code provenance (I can't tell if it still does or not). Reading the 2020 thread in the mailing list I see that @neilcsmith-net wanted to keep the squash option in github. It eased things during releases, IIRC. One solution that may fit all is to keep the button as is, and let each committer to decide whether contributions are to be squashed using this github three-in-one button or to request a squash for contributtions. I personally will choose the second one from one on. -- 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
