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
..
bash-exec.sh	feat(bash-exec): add option to ignore shell library files (#5254)	2024-02-27 18:17:22 +00:00
build-metadata.sh	build: fix build metadata (#6015)	2024-08-13 14:26:26 +02:00
git-merge-conflict-markers.sh	fix: make git conflict markers check more precise (#6379)	2024-12-03 15:03:44 +00:00
install-arm-ttk.sh	Simplify container image build (#4962)	2023-12-15 11:59:36 +01:00
install-checkstyle.sh	chore: simplified awk usage for version extraction (#5893)	2024-09-27 09:59:31 +02:00
install-chktex.sh	build: fail on errors when installing chktex (#5214)	2024-02-05 10:31:43 +01:00
install-glibc.sh	build: add glibc via gcompat layer (#5334)	2024-02-29 17:12:01 +00:00
install-google-java-format.sh	chore: simplified awk usage for version extraction (#5893)	2024-09-27 09:59:31 +02:00
install-ktlint.sh	chore: simplified awk usage for version extraction (#5893)	2024-09-27 09:59:31 +02:00
install-lintr.sh	build: reduce container image size (#5072)	2023-12-29 19:30:58 +01:00
install-lua.sh	build: install lua from the os package repository (#5655)	2024-05-28 08:39:07 +02:00
install-r-package-or-fail.R	fix: fail if r package installation fails (#4994)	2023-12-21 20:52:57 +01:00
linterVersions.sh	chore: shorten linter versions (#6176)	2024-10-14 18:43:10 +02:00