Skip to content
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

Merged
merged 9 commits into from
Nov 13, 2023

Conversation

etobella
Copy link
Member

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,

@dreispt
Copy link
Member

dreispt commented Oct 28, 2023

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 15.0-ocabot-merge-pr-1125-by-dreispt-bump-patch, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Oct 28, 2023
Signed-off-by dreispt
@OCA-git-bot
Copy link
Contributor

@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.

@brian10048
Copy link
Contributor

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 15.0-ocabot-merge-pr-1125-by-brian10048-bump-patch, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Nov 9, 2023
Signed-off-by brian10048
@OCA-git-bot
Copy link
Contributor

@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.

@etobella
Copy link
Member Author

etobella commented Nov 9, 2023

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 15.0-ocabot-merge-pr-1125-by-etobella-bump-patch, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Nov 9, 2023
Signed-off-by etobella
@OCA-git-bot
Copy link
Contributor

@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.

@etobella
Copy link
Member Author

etobella commented Nov 9, 2023

@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?

@sbidoul
Copy link
Member

sbidoul commented Nov 11, 2023

Looks like .github/workflows/pre-commit.yml has a merge conflict

@brian10048
Copy link
Contributor

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 15.0-ocabot-merge-pr-1125-by-brian10048-bump-patch, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit cff111a into 15.0 Nov 13, 2023
11 checks passed
@OCA-git-bot OCA-git-bot deleted the 15.0-ocabot-update-dotfiles branch November 13, 2023 14:42
@OCA-git-bot
Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants