github-actions[bot] f3c34843e1 fix: Make Git conflict markers check more precise ... 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. Additionally update one good test file.		2024-11-20 15:31:02 +02:00
..
ISSUE_TEMPLATE	chore: fix formatting issues (#6028)	2024-08-15 10:21:26 +02:00
linters	feat: lint commit messages with commitlint (#6118)	2024-09-19 08:53:13 +00:00
release-please	fix: Make Git conflict markers check more precise	2024-11-20 15:31:02 +02:00
workflows	fix: Make Git conflict markers check more precise	2024-11-20 15:31:02 +02:00
CODEOWNERS	Simplify container image build (#4962)	2023-12-15 11:59:36 +01:00
CONTRIBUTING.md	chore: devcontainer, docs, prettier config (#6119)	2024-09-13 14:37:48 +02:00
dependabot.yml	chore: move base image to a dedicated group (#6351)	2024-11-15 09:03:54 +01:00
pull_request-template.md	chore: devcontainer, docs, prettier config (#6119)	2024-09-13 14:37:48 +02:00