Skip to content

Conversation

@pmrowla
Copy link
Contributor

@pmrowla pmrowla commented Nov 28, 2022

No description provided.

- id: check-json
- id: check-merge-conflict
args: ['--assume-in-merge']
exclude: "README.rst"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

merge conflict check will give false positive on rst files with 7-character ======= headings, there is no workaround other than excluding the entire file

pre-commit/pre-commit-hooks#100

@pmrowla pmrowla merged commit e8b1c28 into main Nov 28, 2022
@pmrowla pmrowla deleted the cruft-update branch November 28, 2022 09:56
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.

2 participants