Create vale test for unresolved merge conflicts

d8730d0f · Marcel Amirault · Evan Read · 21ca8494 · d8730d0f
Commit d8730d0f authored May 27, 2020 by Marcel Amirault Committed by Evan Read May 27, 2020
Show whitespace changes
Inline Side-by-side

Showing with 13 additions and 0 deletions

doc/.vale/gitlab/MergeConflictMarkers.yml doc/.vale/gitlab/MergeConflictMarkers.yml +13 -0

No files found.
--- a/doc/.vale/gitlab/MergeConflictMarkers.yml
+++ b/doc/.vale/gitlab/MergeConflictMarkers.yml
+---
+# Error: gitlab.MergeConflictMarkers
+#
+# Checks for the presence of merge conflict markers.
+#
+# For a list of all options, see https://errata-ai.github.io/vale/styles/
+extends: existence
+message: 'Merge conflict marker "%s" found.'
+link: https://docs.gitlab.com/ee/development/code_review.html#merging-a-merge-request
+level: error
+scope: raw
+raw:
+  - '\n<<<<<<< .+\n|\n=======\n|\n>>>>>>> .+\n'