Commit 7b152201 authored by Evan Read's avatar Evan Read

Merge branch 'docs-vale-merge-conflict-test' into 'master'

Create vale test for unresolved merge conflicts

Closes #219168

See merge request gitlab-org/gitlab!33125
parents e54821cc d8730d0f
---
# 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'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment