Find Git Merge Conflict Markers
When you have a merge conflict, Git puts markers in your files that you have to resolve. Use Vale to detect these markers and flag them using the following rule:
extends: existence
message: "You have a merge conflict! Fix the conflict and try again."
nonword: true
level: error
tokens:
- '^[<|=|>]{7}( .+)?$'
This rule uses the nonword: true setting so that Vale doesn’t add word boundaries around the regular expression.
Tags:
Found this useful?
Buy the book