Hi,
So, if I understand correctly:
a) It's ok to use the squash-and-merge button if contributors have
proper github/email addresses in their github profile (is this so? or do
we want to disable it completely?).
b) Otherwise we prefer that contributors squash themselves (git rebase
-i) and update their PR branch (git push -f).
c) Otherwise we committers can squash using the command line with the
detailed instructions that Matthias suggested on 2019-12-12 ([1]).
Am I understading this correctly?
Thanks,
Antonio
[1]
http://mail-archives.apache.org/mod_mbox/netbeans-dev/201912.mbox/%3C6157b71ba7974359a3d1b9ae83bbb4a0ea2c9b2d.camel%40doppel-helix.eu%3E
El 6/4/21 a las 0:10, Neil C Smith escribió:
On Mon, 5 Apr 2021, 22:48 antonio, <[email protected]> wrote:
Sorry for the late reply.
+1 to disable the squash-and-merge button in github.
I'm +1 to this in retrospect too, as long as we also squash and force push
to PR branches to merge where needed (every committer can by default). I've
done this with a few where author wanted help. Direct merges to master with
manually closed PRs cause other issues for us during releases, so can we
please stop that one?
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
