[16.0] dotfiles update needs manual intervention

OCA / stock-logistics-barcode

https://odoo-community.org/psc-teams/logistics-18

GNU Affero General Public License v3.0

158 stars 324 forks source link

[16.0] dotfiles update needs manual intervention #549

Closed etobella closed 10 months ago

etobella commented 10 months ago

Dear maintainer,

After updating the dotfiles, pre-commit run -a fails in a manner that cannot be resolved automatically.

Can you please have a look, fix and merge?

Thanks,

pedrobaeza commented 10 months ago

/ocabot merge patch

OCA-git-bot commented 10 months ago

Hey, thanks for contributing! Proceeding to merge this for you. Prepared branch 16.0-ocabot-merge-pr-549-by-pedrobaeza-bump-patch, awaiting test results.

OCA-git-bot commented 10 months ago

@pedrobaeza The merge process could not be finalized, because command git push origin 16.0-ocabot-merge-pr-549-by-pedrobaeza-bump-patch:16.0 failed with output:

To https://github.com/OCA/stock-logistics-barcode
 ! [remote rejected]   16.0-ocabot-merge-pr-549-by-pedrobaeza-bump-patch -> 16.0 (cannot lock ref 'refs/heads/16.0': is at 4bf0fc01ac24a156d0e07aa7355bb0b072be23f7 but expected 1ded5260089f0fb1a3b33d00967ebdc2cf7c7005)
error: failed to push some refs to 'https://***@github.com/OCA/stock-logistics-barcode'

OCA-git-bot commented 10 months ago

Congratulations, your PR was merged at 4bf0fc01ac24a156d0e07aa7355bb0b072be23f7. Thanks a lot for contributing to OCA. ❤️