> 1. Ask the author to update his author information and squash the commits and > force push the updated commit
If the author puts his proper email on his Github profile, will the "Squash and Merge" button work? Or will he still have to do the manual squash and force push? -- Eirik -----Original Message----- From: Matthias Bläsing <[email protected]> Sent: Friday, October 9, 2020 1:01 PM To: [email protected] Subject: Re: Merging on github (aka Squash and Merge is broken) Hi Eirik, actually not sure if github improved, but I looked at the profile of the author: https://github.com/MKuettner and there is a real name (great), but no email address. Looking at the commits (locally), I see a valid email address, but the real name part is not complete. I see two options: 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). HTH Matthias Am Freitag, den 09.10.2020, 16:26 +0000 schrieb Eirik Bakke: > What's the status on "Squash and merge"? > > I'd like to merge the PR at > https://github.com/apache/netbeans/pull/2410 , but I can't remember > how to verify that "Squash and merge" won't put in bogus author > information. > > -- Eirik > > -----Original Message----- > From: Neil C Smith <[email protected]> > Sent: Sunday, August 9, 2020 8:43 AM > To: dev <[email protected]> > Subject: Re: Merging on github (aka Squash and Merge is broken) > > On Thu, 12 Dec 2019 at 20:41, Matthias Bläsing < > [email protected]> wrote: > > 14. Switch back to master > > > > git checkout master > > > > 15. Merge (commit hash from above): > > > > git merge c20b63503c98 > > > > 16. Push > > > > git push > > > > > > Do this multiple times with test sets, then its _very_ easy. The > > alternative is of course to ask the author to do the squash himself, > > he can update the PR (requires a forced push) > > Just following up on this. I've had a few of these come up during > 12.1 so far. I'm also not entirely a fan of bypassing the PR system > or direct pushes to upstream master (I have push-url set to disabled > by default). > > As well as the author squashing the PR, it is also possible for any > committer to force push the PR branch (by default anyway) if the > author cannot for some reason. I did this with eg. > https://github.com/apache/netbeans/pull/2023 And I think all is fine > with the git history on this. > > Matthias, could you have a quick check on that? I used your > instructions roughly up to where to push to. But this has the benefit > of linking back to original PR / closing, allowing the author to check > over, and running CI tests again before merging. Thoughts on pros / > cons of updating instructions to recommend this? > > Thanks and 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 > > > > > --------------------------------------------------------------------- > 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 > > > --------------------------------------------------------------------- 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
