Merge pull request #346 from commerce-docs/ds_superlinter

Enable linter VALIDATE_GIT_MERGE_CONFLICT_MARKERS
AdobeDocs · Feb 14, 2025 · 2c5ddf3 · 2c5ddf3
2 parents 4457626 + b3eddcb
commit 2c5ddf3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
@@ -71,4 +71,4 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage], versi
 available at [https://contributor-covenant.org/version/1/4][version].
 
 [homepage]: https://contributor-covenant.org
-[version]: https://contributor-covenant.org/version/1/4/
+[version]: https://contributor-covenant.org/version/1/4/
diff --git a/.github/super-linter.env b/.github/super-linter.env
@@ -1,6 +1,7 @@
 IGNORE_GITIGNORED_FILES=true
 MARKDOWN_CONFIG_FILE=.markdownlint.yml
 VALIDATE_ALL_CODEBASE=false
+VALIDATE_GIT_MERGE_CONFLICT_MARKERS=true
 VALIDATE_GITHUB_ACTIONS=true
 VALIDATE_JSON=true
 VALIDATE_MARKDOWN=true

diff --git a/.github/workflows/test-pull-request.yml b/.github/workflows/test-pull-request.yml
@@ -60,10 +60,9 @@
           # Use full version number to avoid cases when a next
           # released version is buggy
           # About slim image: https://github.com/github/super-linter#slim-image
-          uses: super-linter/super-linter/[email protected].0
+          uses: super-linter/super-linter/[email protected].1
           env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            DEFAULT_BRANCH: main
 
     test:
       runs-on: ubuntu-latest