fix: align remaining dev/main conflict files for #427 (v4)

.github/workflows/squad-standard-lint-markdown.yml

@@ -9,22 +9,15 @@ jobs:
   lint-markdown:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v7
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-node@v6
+      - uses: actions/checkout@v6
+      - uses: actions/setup-node@v5
         with:
           node-version: "22"
       - name: Run markdownlint
         run: |
-          if [ "${{ github.event_name }}" = "pull_request" ]; then
-            git fetch --no-tags origin "${{ github.base_ref }}:${{ github.base_ref }}"
-            files=$(git diff --name-only "${{ github.base_ref }}...HEAD" -- '*.md')
-          else
-            files=$(git ls-files '*.md')
-          fi
+          files=$(git ls-files '*.md')
           if [ -z "$files" ]; then
-            echo "No markdown files to lint."
+            echo "No markdown files found."
             exit 0
           fi
           npx --yes markdownlint-cli $files

.github/workflows/squad-standard-lint-yaml.yml

@@ -1,8 +1,5 @@
 name: lint-yaml
 
-# Ensures YAML lint workflow runs on conflict-fix PRs that touch this file.
-# Keep this workflow touched when resolving recurring PR context mismatches.
-
 on:
   pull_request:
     branches: [dev, main]
@@ -12,23 +9,16 @@ jobs:
   lint-yaml:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v7
-        with:
-          fetch-depth: 0
+      - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
         with:
           python-version: "3.x"
       - name: Run yamllint
         run: |
           python -m pip install --quiet yamllint
-          if [ "${{ github.event_name }}" = "pull_request" ]; then
-            git fetch --no-tags origin "${{ github.base_ref }}:${{ github.base_ref }}"
-            files=$(git diff --name-only "${{ github.base_ref }}...HEAD" -- '*.yml' '*.yaml')
-          else
-            files=$(git ls-files '*.yml' '*.yaml')
-          fi
+          files=$(git ls-files '*.yml' '*.yaml')
           if [ -z "$files" ]; then
-            echo "No YAML files to lint."
+            echo "No YAML files found."
             exit 0
           fi
           yamllint -s $files