In my case I'm using git on Windows with WSL, which unfortunately is very slow when working with the NetBeans repository. Stashing my own changes, switching branches, rebasing to squash etc. turns merging someone else's PR into a 30-minute operation. It's a lot easier, for me at least as a reviewer, if the original PR author configures their github with the right info so that "Squash and Merge" will just work correctly.
-- Eirik -----Original Message----- From: Neil C Smith <[email protected]> Sent: Friday, October 9, 2020 1:37 PM To: dev <[email protected]> Subject: Re: Merging on github (aka Squash and Merge is broken) On Fri, 9 Oct 2020 at 18:00, Matthias Bläsing <[email protected]> wrote: > 1. Ask the author to update his author information and squash the > commits and force push the updated commit 2. Do it yourself locally > and update the author information > > From a "good for future" perspective, I would prefer (1). A reminder from email above that if doing (2) you can force push to the author's PR branch, which any committer can do by default, then get the author to check if necessary, and merge as normal. That way we don't bypass PR statuses, etc. 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
