matthiasblaesing commented on PR #5567: URL: https://github.com/apache/netbeans/pull/5567#issuecomment-1456776923
@vieiro this is not nice, but also not fatal. We can't back this out, as history already progressed over it and in all fairness, the commits look sensible to me, so it is just a bit more verbose, than it should have been. Letss keep it at that. My general feeling towards the github GUI is, that it is ok to read commits and discuss them, but when it comes to more complex merges, I prefer the git CLI, as from my POV github is not predictable. At least in the past it scrambled author information and so I would advice to use this approach: - author your PR as detailed as necessary for work - for updates while it is in work, add new commit with a granuality, that allows selective squashing at the end - when you are happy with it and review is done, squash locally, until you are happy - force push the branch - Use compare button to check, that the PR as a whole still contains the same code - wait for CI/CD to become green - do a straight merge with github gui (no rebasing, no squashing done by github) -- 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
