search

OCA / l10n-romania

Romanian Localization for Odoo
GNU Affero General Public License v3.0
28 stars 39 forks source link

[17.0] dotfiles update needs manual intervention #957

Closed sbidoul closed 6 months ago

sbidoul commented 6 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,

Handled by @Tecnativa

pedrobaeza commented 6 months ago

/ocabot merge patch

OCA-git-bot commented 6 months ago

On my way to merge this fine PR! Prepared branch 17.0-ocabot-merge-pr-957-by-pedrobaeza-bump-patch, awaiting test results.

OCA-git-bot commented 6 months ago

@pedrobaeza your merge command was aborted due to failed check(s), which you can inspect on this commit of 17.0-ocabot-merge-pr-957-by-pedrobaeza-bump-patch.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

dhongu commented 6 months ago

/ocabot merge patch

OCA-git-bot commented 6 months ago

@dhongu The merge process could not start, because command git fetch --quiet --force --prune https://github.com/OCA/l10n-romania 'refs/heads/*:refs/heads/*' failed with output:

error: cannot lock ref 'refs/heads/17.0-ocabot-update-dotfiles': is at 4f18bcaa355dbf7cf6471225a838614aece90775 but expected 52be6cad24eaee189d69e8e57664f061e70bda3a
pedrobaeza commented 6 months ago

/ocabot merge patch

OCA-git-bot commented 6 months ago

On my way to merge this fine PR! Prepared branch 17.0-ocabot-merge-pr-957-by-pedrobaeza-bump-patch, awaiting test results.

OCA-git-bot commented 6 months ago

It looks like something changed on 17.0 in the meantime. Let me try again (no action is required from you). Prepared branch 17.0-ocabot-merge-pr-957-by-pedrobaeza-bump-patch, awaiting test results.

OCA-git-bot commented 6 months ago

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