2020-06-23 00:09:42 +05:30
|
|
|
---
|
|
|
|
|
# Error: gitlab.MergeConflictMarkers
|
|
|
|
|
#
|
|
|
|
|
# Checks for the presence of merge conflict markers.
|
|
|
|
|
#
|
2023-01-13 00:05:48 +05:30
|
|
|
# For a list of all options, see https://vale.sh/docs/topics/styles/
|
2020-06-23 00:09:42 +05:30
|
|
|
extends: existence
|
2023-01-13 00:05:48 +05:30
|
|
|
message: "Remove the merge conflict marker '%s'."
|
2020-06-23 00:09:42 +05:30
|
|
|
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'
|
