This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 7e998f92283 pre-commit: add hook `check-merge-conflict` (#7883)
7e998f92283 is described below
commit 7e998f922830ab0516837a133e0ce4aaf736b006
Author: John Bampton <[email protected]>
AuthorDate: Tue Oct 10 16:33:51 2023 +1000
pre-commit: add hook `check-merge-conflict` (#7883)
---
.pre-commit-config.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f7c3c0f90e1..d41673fb742 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -31,7 +31,7 @@ repos:
#- id: check-added-large-files
- id: check-case-conflict
#- id: check-executables-have-shebangs
- #- id: check-merge-conflict
+ - id: check-merge-conflict
- id: check-vcs-permalinks
#- id: check-yaml
- id: detect-private-key
