search

OCA / oca-github-bot

The GitHub Bot of the Odoo Community Association (OCA)
MIT License
42 stars 61 forks source link

The bot is not merging now #152

Closed yajo closed 3 years ago

yajo commented 3 years ago

Something must have failed in the last deployment; the bot is not merging.

Here you can see that I issued the merge command, the bot created the branch, it finished in green, but it didn't merge it. I repeated, and the same: https://github.com/OCA/event/pull/231#issuecomment-898281311

cc @sbidoul

legalsylvain commented 3 years ago

Are you sure ? there is a message on your PR : 

@Yajo The merge process could not start, because command `git merge --no-ff -m Merge PR #231 into 13.0

Signed-off-by Yajo tmp-pr-231` failed with output:

CONFLICT (add/add): Merge conflict in website_event_questions_free_text/README.rst
Auto-merging website_event_questions_free_text/README.rst
Automatic merge failed; fix conflicts and then commit the result.

or maybe it was not finished and still WIP. So your manual merge made the bot merge fail. Don't you think ?

you just waited a couple of minutes before manual merging.

legalsylvain commented 3 years ago

FYI, I just merged a PR on OCA/pos

Ref : https://github.com/OCA/pos/pull/700

kind regards.

yajo commented 3 years ago

there is a message on your PR

That message was posted after I manually merged the PR and conflicts happened, but not before (see the timeline).

legalsylvain commented 3 years ago

yes, but if the message is displayed, it means the bot was still working. Don't you think ?

sbidoul commented 3 years ago

The most probable explanation is that the status webhooks were triggered while the bot was restarting, and GitHub retried them a little bit later. So yes, everything operating normally as far as I can tell.