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 #380

Closed
wants to merge 1 commit into from

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 27, 2023

@etobella There is something wrong with the pre-commit config: I get an "InvalidConfigError".

$ pre-commit run -a
An error has occurred: InvalidConfigError:
==> File .pre-commit-config.yaml
=====> while scanning a simple key
  in "<unicode string>", line 38, column 1
could not find expected ':'
  in "<unicode string>", line 39, column 8
Check the log at /home/dreis/.cache/pre-commit/pre-commit.log

@@ -33,12 +35,28 @@ repos:
language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/oca/maintainer-tools
<<<<<<< before updating
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dreispt here is the problem. Merge conflict.

@dreispt
Copy link
Member

dreispt commented Oct 27, 2023

Superseded by #381

@pedrobaeza pedrobaeza closed this Oct 27, 2023
@pedrobaeza pedrobaeza deleted the 14.0-ocabot-update-dotfiles branch October 27, 2023 19:20
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.

4 participants