2 commits

Author	SHA1	Message	Date
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
Marco Ferrari	e0d8b4fb2f	feat: implement a linter to check git conflicts (#6113) ... Implement a linter to check if files contain Git conflict markers or whitespace errors.	2024-09-05 08:02:36 +02:00