Hi Antonio,
don't panic, its not the first time that something like that happened.
It was a big PR so it is ok to have it merged with multiple commits.
Sure 32 is a bit much but in all honestly I prefer that to 1, since
again, this was no trivial PR.
Lets keep it as is, rewriting history of master isn't something we
should do just to make it prettier. (we can fix email addresses via a
mapping file, those things are possible of course)
Master is also force push protected for good reasons.
the lesson learned here is to not use the squash feature of github, it
simply is not transparent how it works (if it works) and how it handles
squashes of multiple authors which may or may not have made their emails
public on gh. We should consider to turn that button off.
the last post-review step of large PRs should be:
- local squashing to the desired/minimal amount of commits (every
commit has to be at least buildable so that git bisect works)
- check that all commit headers are as expected
- rebase to latest master and force push to PR, wait for green CI -> merge
gh has a compare button which also handles force pushes. The diff should
be empty post squash - that is easy to verify.
i wrote this page on the wiki a few weeks ago:
https://cwiki.apache.org/confluence/display/NETBEANS/PRs+and+You+-+A+reviewer+Guide
we could probably add a few points there
there is also this page which is more generic and probably a bit dusty:
https://cwiki.apache.org/confluence/display/NETBEANS/Submitting+Pull+Requests
all good, looking forward to rust support in NB!
best regards,
michael
On 06.03.23 20:05, Antonio wrote:
Hi all,
It seems the Rust branch was not cleanly squashed and merged to master
(I used the Github's "Squash and Merge" button), so we ended up with
different commits in master.
Do we revert those commits in master?
Thanks,
Antonio
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@netbeans.apache.org
For additional commands, e-mail: dev-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@netbeans.apache.org
For additional commands, e-mail: dev-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
