From e226d15c085eb79cf47b72b8e2b8647e065e3a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Gill=C3=A9?=
 <philippgille@users.noreply.github.com>
Date: Sat, 25 Oct 2025 12:20:48 +0200
Subject: [PATCH] Change master branch update strategy to reset from main

Instead of pulling master and creating a merge commit, if the goal is to mirror main in master, a hard reset reflects this better.
---
 .github/workflows/sync-master.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/sync-master.yaml b/.github/workflows/sync-master.yaml
index 09c620c..226c835 100644
--- a/.github/workflows/sync-master.yaml
+++ b/.github/workflows/sync-master.yaml
@@ -18,6 +18,5 @@ jobs:
         # we keep master around because homebrew cannot deal with the rename
         run: |
           git switch master
-          git pull origin master
-          git merge main
+          git reset --hard main
           git push origin master