debian-mirror-gitlab/doc/.vale/gitlab/MergeConflictMarkers.yml

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

14 lines
415 B
YAML
Raw Normal View History

2020-06-23 00:09:42 +05:30
---
# Error: gitlab.MergeConflictMarkers
#
# Checks for the presence of merge conflict markers.
#
2020-07-28 23:09:34 +05:30
# For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
2020-06-23 00:09:42 +05:30
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'