From 5ac9ec214ba3ef1632701416f27948a57ec60919 Mon Sep 17 00:00:00 2001
From: comfyanonymous <121283862+comfyanonymous@users.noreply.github.com>
Date: Tue, 22 Jul 2025 01:07:51 -0700
Subject: [PATCH] Try to fix line endings workflow. (#9001)

---
 .github/workflows/check-line-endings.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/check-line-endings.yml b/.github/workflows/check-line-endings.yml
index f20dca565..03b3e3ced 100644
--- a/.github/workflows/check-line-endings.yml
+++ b/.github/workflows/check-line-endings.yml
@@ -17,6 +17,7 @@ jobs:
       - name: Check for Windows line endings (CRLF)
         run: |
           # Get the list of changed files in the PR
+          git merge origin/${{ github.base_ref }} --no-edit
           CHANGED_FILES=$(git diff --name-only origin/${{ github.base_ref }}..HEAD)
 
           # Flag to track if CRLF is found