search

OCA / oca-github-bot

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

ocabot merge: Protected branch update failed for #210

Closed hparfr closed 1 year ago

hparfr commented 1 year ago

On Field-service repo, ocabot merge fails: for instance: https://github.com/OCA/field-service/pull/957

`@hparfr The merge process could not be finalized, because command git push origin 14.0-ocabot-merge-pr-957-by-hparfr-bump-minor:14.0 failed with output:

remote: error: GH006: Protected branch update failed for refs/heads/14.0.
remote: error: Changes must be made through a pull request.
To https://github.com/OCA/field-service ! [remote rejected] 14.0-ocabot-merge-pr-957-by-hparfr-bump-minor -> 14.0 (protected branch hook declined) error: failed to push some refs to 'https://***@github.com/OCA/field-service' `

Any ideas ?

legalsylvain commented 1 year ago

I had the same problem on a GRAP repo. AFAIK, protected branch is impatible with oca-bot merge command.

solution 1 : unprotect the main branches. (what I did) solution 2 : propose a patch in oca-bot with an alternative git command. (I'm not sure it's possible though)

removing the bug label, as it is "normal" that running command git push [...] 14.0 on a protected branch fail.