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

[14.0] dotfiles update needs manual intervention #387

Merged
merged 4 commits into from
May 2, 2024

Conversation

sbidoul
Copy link
Member

@sbidoul sbidoul commented May 1, 2024

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 pedrobaeza added this to the 14.0 milestone May 2, 2024
@pedrobaeza
Copy link
Member

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

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

OCA-git-bot added a commit that referenced this pull request May 2, 2024
Signed-off-by pedrobaeza
@pedrobaeza pedrobaeza force-pushed the 14.0-ocabot-update-dotfiles branch from 01aa9b3 to 78c94c8 Compare May 2, 2024 14:40
@OCA-git-bot
Copy link
Contributor

@pedrobaeza your merge command was aborted due to failed check(s), which you can inspect on this commit of 14.0-ocabot-merge-pr-387-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.

@pedrobaeza
Copy link
Member

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

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

@OCA-git-bot OCA-git-bot merged commit a1cdd74 into 14.0 May 2, 2024
11 checks passed
@OCA-git-bot OCA-git-bot deleted the 14.0-ocabot-update-dotfiles branch May 2, 2024 14:49
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 16ce125. 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.

3 participants