George L. Yermulnik d929d049cb fix: make git conflict markers check more precise (#6379) ... 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>		2024-12-03 15:03:44 +00:00
..
git_merge_conflict_markers_bad_01.txt	feat: implement a linter to check git conflicts (#6113)	2024-09-05 08:02:36 +02:00
git_merge_conflict_markers_bad_02.txt	feat: implement a linter to check git conflicts (#6113)	2024-09-05 08:02:36 +02:00
git_merge_conflict_markers_good_01.txt	feat: implement a linter to check git conflicts (#6113)	2024-09-05 08:02:36 +02:00
git_merge_conflict_markers_good_02.txt	fix: make git conflict markers check more precise (#6379)	2024-12-03 15:03:44 +00:00