From 0cec8ae60f3f9d0d27f8acabfa3ac25fd157beee Mon Sep 17 00:00:00 2001
From: Alex Bates <alex@bates64.com>
Date: Wed, 5 Jun 2024 17:17:59 +0100
Subject: [PATCH] ci: fix? sync workflow

---
 .gitattributes             | 5 +++++
 .github/workflows/sync.yml | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 668ebff92c..d67e1378d2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,3 +2,8 @@
 
 # suppress asm/nonmatchings/ in GitHub diffs
 asm/nonmatchings/**/*.s linguist-generated
+
+*.c	diff=cpp
+*.h	diff=cpp
+
+src/world/dead/**/* merge=ours
diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
index c21ef51b4b..657fc589e1 100644
--- a/.github/workflows/sync.yml
+++ b/.github/workflows/sync.yml
@@ -38,10 +38,6 @@ jobs:
         run: |
           git checkout ${BASE_BRANCH}
           git merge --no-ff --log FETCH_HEAD -m "Merge upstream changes"
-      - name: Push changes
-        run: git push origin ${BASE_BRANCH}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Create Pull Request
         run: |
           gh pr create --title "Sync with $UPSTREAM" --body "Automated PR to keep this repository in sync with upstream. Beep boop." --base ${BASE_BRANCH}