Hi again,

It seems you can add two empty lines and the one or more "Co-authored-by:" lines at the bottom of the commit messages, and then github properly acknowledges the authors (can't tell if "git blame" works, though).

I asked in the comdev mailing list [2], and someone from Apache Airflow said they had automated this in the pull requests (screenshot at [3]) using a combination of a github workflow and a "git mob hook".

I don't know if we can set this up as well, but we may want to try out a squash-and-merge adding a "Co-authored-by: " next time.

Kind regards,
Antonio


[1]
https://gist.github.com/lisawolderiksen/f9747a3ae1e58e9daa7d176ab98f1bad

[2]
https://mail-archives.apache.org/mod_mbox/community-dev//202104.mbox/%3CCAH067Rn5Nt_SFUQQhJqizUm9irJWYTWH3CeapkO9FWjCe%2BY2sw%40mail.gmail.com%3E

[3]
https://pasteboard.co/JW8pJnQ.png



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



Reply via email to