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
..
data	feat: lint commit messages with commitlint (#6118)	2024-09-19 08:53:13 +00:00
inspec/super-linter	feat: lint commit messages with commitlint (#6118)	2024-09-19 08:53:13 +00:00
lib	chore: prepare tests for updates (#6279)	2024-11-14 15:29:44 +01:00
linters	fix: make git conflict markers check more precise (#6379)	2024-12-03 15:03:44 +00:00
linters-config/fix-mode	chore: fix formatting issues (#6028)	2024-08-15 10:21:26 +02:00
run-super-linter-tests.sh	fix: define command options function before use (#6375)	2024-11-27 14:33:40 +01:00
testUtils.sh	chore: prepare tests for updates (#6279)	2024-11-14 15:29:44 +01:00
validate-docker-labels.sh	Validate container image labels (#4926)	2023-12-07 14:18:47 +00:00