From 0059d37db582570b8f2c5155ee886d377227f0d2 Mon Sep 17 00:00:00 2001
From: Asher <ash@coder.com>
Date: Thu, 7 May 2026 10:23:06 -0800
Subject: [PATCH] Reset cdrci aur repo when publishing

I figure it is probably faster to keep it up to date than to merge
larger and larger changes each time?
---
 .github/workflows/publish.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 75e652408..143dfb4e3 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -70,11 +70,12 @@ jobs:
           token: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}
           ref: "master"
 
-      - name: Merge in master
+      - name: Fetch and reset master
         run: |
           git remote add upstream https://github.com/coder/code-server-aur.git
           git fetch upstream
-          git merge upstream/master
+          git reset --hard upstream/master
+          git push --force
 
       - name: Configure git
         run: |