mirror of
https://github.com/super-linter/super-linter.git
synced 2024-12-22 04:32:16 -05:00
d929d049cb
The https://github.com/super-linter/super-linter/pull/6113 introduced new Git merge conflicts linter check, that is error prone in some conditions (see screenshot). This PR adjusts this check to be more precise and exact in a way that all three markers should be found to identify check as failed. Additionally improve Git merge conflict markers matchers. Co-authored-by: Marco Ferrari <ferrari.marco@gmail.com> |
||
---|---|---|
.. | ||
git_merge_conflict_markers_bad_01.txt | ||
git_merge_conflict_markers_bad_02.txt | ||
git_merge_conflict_markers_good_01.txt | ||
git_merge_conflict_markers_good_02.txt |