diff options
Diffstat (limited to 'doc/.vale/gitlab/MergeConflictMarkers.yml')
| -rw-r--r-- | doc/.vale/gitlab/MergeConflictMarkers.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/.vale/gitlab/MergeConflictMarkers.yml b/doc/.vale/gitlab/MergeConflictMarkers.yml index 4f216ac34c5..54e044f195d 100644 --- a/doc/.vale/gitlab/MergeConflictMarkers.yml +++ b/doc/.vale/gitlab/MergeConflictMarkers.yml @@ -3,9 +3,9 @@ # # Checks for the presence of merge conflict markers. # -# For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles +# For a list of all options, see https://vale.sh/docs/topics/styles/ extends: existence -message: 'Merge conflict marker "%s" found.' +message: "Remove the merge conflict marker '%s'." link: https://docs.gitlab.com/ee/development/code_review.html#merging-a-merge-request level: error scope: raw |