-
Notifications
You must be signed in to change notification settings - Fork 242
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[15.0] dotfiles update needs manual intervention #1125
Conversation
/ocabot merge patch |
What a great day to merge this nice PR. Let's do it! |
@dreispt your merge command was aborted due to failed check(s), which you can inspect on this commit of 15.0-ocabot-merge-pr-1125-by-dreispt-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. |
/ocabot merge patch |
What a great day to merge this nice PR. Let's do it! |
@brian10048 your merge command was aborted due to failed check(s), which you can inspect on this commit of 15.0-ocabot-merge-pr-1125-by-brian10048-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. |
/ocabot merge patch |
This PR looks fantastic, let's merge it! |
@etobella your merge command was aborted due to failed check(s), which you can inspect on this commit of 15.0-ocabot-merge-pr-1125-by-etobella-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. |
@sbidoul Something weird is happening here, we launch the merge patch and automatically the bot says that it failed. Any idea why this could happen? |
Looks like .github/workflows/pre-commit.yml has a merge conflict |
/ocabot merge patch |
This PR looks fantastic, let's merge it! |
Congratulations, your PR was merged at 22517ad. Thanks a lot for contributing to OCA. ❤️ |
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,