prepared a draft PR:
https://github.com/apache/netbeans/pull/5617
btw this would be an example of a local squash + force push post review:
https://github.com/apache/netbeans/pull/5122/#event-8082217869
if you press the compare button you see the diff is empty -> all good to
merge
-mbien
On 06.03.23 21:05, Antonio wrote:
Hi,
I think squashing at home is the way to go.
Looking at the archives, Matthias asked in may 2020 [1] to disable
github's squash-and-merge button completely (because authorship was
mangled with).
That was a great piece of advice, I think.
Cheers,
Antonio
[1]
https://lists.apache.org/thread/f7vqowtobdfj1t53sfvsdpzx2w5d48j5
On 6/3/23 20:44, Michael Bien wrote:
On 06.03.23 20:25, Michael Bien wrote:
- 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.
small correction: the last rebase-to-latest-master should be skipped
if it is post review unless there is a good reason for that (e.g
conflicts/very old PR). Since this will actually produce a huge diff
when the compare button on the force push is pressed and make it very
hard to see what happened in that force push (it should be empty if
it was just a squash/commit cleanup for easy verification).
-mbien
---------------------------------------------------------------------
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
