From 0002b1cc208a631917c8e2bca1347cac811ef4c7 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 8 Aug 2022 19:05:41 +0100
Subject: [PATCH] Also disable line ending conversion for merge workflows
 (#17953)

---
 .github/workflows/develop_update.yml        | 4 ++++
 .github/workflows/feature_branch_update.yml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml
index 928327e7ebd..18ca84162ba 100644
--- a/.github/workflows/develop_update.yml
+++ b/.github/workflows/develop_update.yml
@@ -17,6 +17,10 @@ jobs:
         token: ${{ secrets.QMK_BOT_TOKEN }}
         fetch-depth: 0
 
+    - name: Disable automatic eol conversion
+      run: |
+        echo "* -text" > .git/info/attributes
+
     - name: Checkout develop
       run: |
         git fetch origin master develop
diff --git a/.github/workflows/feature_branch_update.yml b/.github/workflows/feature_branch_update.yml
index 80891edb01f..90cd85e355a 100644
--- a/.github/workflows/feature_branch_update.yml
+++ b/.github/workflows/feature_branch_update.yml
@@ -22,6 +22,10 @@ jobs:
         token: ${{ secrets.QMK_BOT_TOKEN }}
         fetch-depth: 0
 
+    - name: Disable automatic eol conversion
+      run: |
+        echo "* -text" > .git/info/attributes
+
     - name: Checkout branch
       run: |
         git fetch origin develop ${{ matrix.branch }}