Hello,
Today, I noticed that phpmyadmin-bot will complain about pull requests that include merge commits which don't follow the developer guidelines. Is this how it's supposed to behave or did I do something wrong? As far as I know you can't (and shouldn't) sign off merge commits. You can see an example here [1].
Best regards, Dan Ungureanu
Hi
Dne Mon, 22 Jun 2015 23:37:56 +0300 Dan Ungureanu udan1107@gmail.com napsal(a):
Today, I noticed that phpmyadmin-bot will complain about pull requests that include merge commits which don't follow the developer guidelines. Is this how it's supposed to behave or did I do something wrong? As far as I know you can't (and shouldn't) sign off merge commits. You can see an example here [1].
That's definitely not intentional, I've fixed this in https://github.com/phpmyadmin/scripts/commit/35ebb232b487c14469d73e038faac73...
Anyway I think you should try avoid merge commits in the pull request if possible by rebasing the changes on top of master branch rather than merging these.
-
Dan Ungureanu -
Michal Čihař