If you merge with —no-ff, it prevents a “fast-forward” commit, and creates a merge commit, where you can add a commit comment and the identity of the person doing the merge will be recorded.
It may be possible to setup automatic rejection of fast-forward commits in the ASF repository. Check with Infra. Cheers, Greg Trasuk > On Oct 11, 2017, at 6:39 AM, Geertjan Wielenga > <[email protected]> wrote: > > Excellent! That's a relief. :-) > > But it would be good if we could see who did the merge, is there a way to > see that. > > Gj > > On Wed, Oct 11, 2017 at 11:38 AM, Matthias Bläsing < > [email protected]> wrote: > >> Hey, >> >> asfgit is a bot, that synchronizes the github and Apache git repositories. >> >> There was no automatic merge, I merged your changes, if I saw no problem. >> For problematic changes I added a comment to the PR and die not merge >> >> Greetings >> >> Matthias >> >> >> >> Am 11. Oktober 2017 12:28:35 MESZ schrieb Geertjan Wielenga < >> [email protected]>: >>> Hi all, >>> >>> Someone appears to automatically (I guess a bot) be merging PRs after a >>> couple of days of inactivity, i.e., if there are no comments etc, such >>> as >>> this one of mine: >>> >>> https://github.com/apache/incubator-netbeans/pull/103 >>> >>> Is that correct and what we want? I.e., nobody reviewed the above nor >>> asked >>> any kind of questions about it. >>> >>> Gj >> >> -- >> Diese Nachricht wurde von meinem Android-Mobiltelefon mit K-9 Mail >> gesendet.
