Would it be enough to only check for the <<<<<<< sequence, or should we really check the entire block with the ======== sequence and >>>>>>>>> as well?
Is the first block always named HEAD or could it be something else as well?
I would check for each separately. If I resolved a merge conflict partially and forgot to remove the merge characters, I'd still want to be warned about it. The following is a probable trace of merge conflict resolution that went wrong.
bar
>>>>>>> development
Thus, I'd check for ^<<<<<<<\s, ^========$ and ^>>>>>>>>>\s.
The first block can be named something else, so you should not check that.
Merge conflicts appear in a file like this
Questions I have for implementing this
<<<<<<<
sequence, or should we really check the entire block with the========
sequence and>>>>>>>>>
as well?HEAD
or could it be something else as well?// @jfmengels @sindresorhus