neilcsmith-net commented on PR #5617: URL: https://github.com/apache/netbeans/pull/5617#issuecomment-1493334369
> FWIW, if we can't use squash at merge time, then we can't, but it is pretty unfortunate IMO. @jlahoda but it's also only codifying something that was discussed and (mostly) decided in 2020. I thought it was unfortunate at the time (as was mentioned above), but it's generally working effectively. Whether or not we want to codify makes sense here. Discussing changing the process should probably be a reopened discussion on dev@ so more people are involved / know what is expected / we document it better this time ... Having _one_ way to do this certainly makes it easier to explain to contributors! > force pushing into a branch makes reviewing more difficult; and even force pushing into the branch right before a merge is breaking the record in the PR - it is not clear what has been reviewed, because the commits that were reviewed before do not exist anymore (AFAIK, at least) The PR UI isn't too bad at tracking that in my opinion. It seems to have improved recently too ... or am I just noticing things I hadn't before?! > ... one sometimes needs to merge with master, and rebasing breaks the PR history) Not sure what you mean exactly by breaking the PR history? eg. I always use `rebase --onto` to move just the PR commits when fixing PRs moved from master to delivery. I'm curious what is "broken" there? -- 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
