Hi, Am Samstag, den 10.10.2020, 10:32 -0700 schrieb Laszlo Kishalmi: > It seems it is still an issue on github squash and merge. Just did a > merge. I've checked the email on the individual commits which seemed to > be right and valid, then ended up in the master as > [email protected] > https://github.com/apache/netbeans/commit/7990cee5aa9d8460b563d7ad44d743843c6c064a > > Now what would be the best option? Remove the top of master by force > (not a really nice thing to do) or create a revert PR? Well the first > would resolve the issue commit with the wrong email in the repo, the > later one would be just a corrective one. >
we can't force push into master. That would be a problem for all users already on latest master, as their repository state becomes invalid. I'm also not sure how the github <-> asf sync infrastructure would take it. We should have very good reasons to change history for a public branch, which I would only see for security issues. I suggest to revert the commit with the normal git mechanic (revert commit references reverted commit, possible adding a reasoning). After that a cleaned version can be applied. HTH Matthias --------------------------------------------------------------------- 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
