From e21bb2bfab1382ae61b210aaa2672a082fd2639f Mon Sep 17 00:00:00 2001
From: fithwum <fithwum@hotmail.com>
Date: Mon, 27 Jul 2026 12:36:25 -0700
Subject: [PATCH] fix branch

---
 .../workflows/vintage-story-build-server.yml  | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/.gitea/workflows/vintage-story-build-server.yml b/.gitea/workflows/vintage-story-build-server.yml
index 9fa7012..36a1b3a 100644
--- a/.gitea/workflows/vintage-story-build-server.yml
+++ b/.gitea/workflows/vintage-story-build-server.yml
@@ -88,18 +88,18 @@ jobs:
           git commit -m "Update base digest to $CURRENT_DIGEST" || true
 
           # --- Safe rebase with auto conflict resolution ---
-          git fetch origin master
-          if ! git rebase --strategy-option=theirs origin/master; then
+          git fetch origin main
+          if ! git rebase --strategy-option=theirs origin/main; then
             echo "[WARN] Rebase conflict, auto-resolving by preferring local digest"
             git rebase --abort
-            git fetch origin master
-            git reset --hard origin/master
+            git fetch origin main
+            git reset --hard origin/main
             echo "$CURRENT_DIGEST" > ${{ env.DIGEST_FILE }}
             git add ${{ env.DIGEST_FILE }}
             git commit -m "Force-update base digest to $CURRENT_DIGEST (auto-resolved)"
           fi
 
-          git push origin HEAD:master
+          git push origin HEAD:main
           echo "changed=true" >> $GITHUB_OUTPUT
 
       - name: Detect changed vintage-story versions
@@ -246,27 +246,27 @@ jobs:
           # Push temporary branch
           git push origin HEAD:$TEMP_BRANCH
 
-          # Rebase temp branch onto latest master
-          git fetch origin master
+          # Rebase temp branch onto latest main
+          git fetch origin main
 
           git checkout "$TEMP_BRANCH"
 
-          if ! git rebase origin/master; then
+          if ! git rebase origin/main; then
             echo "[WARN] Rebase failed, using merge instead."
             git rebase --abort || true
-            git merge origin/master --no-edit
+            git merge origin/main --no-edit
           fi
 
           git push origin HEAD:$TEMP_BRANCH --force
 
-          # Fast-forward master
-          git checkout master
-          git reset --hard origin/master
+          # Fast-forward main
+          git checkout main
+          git reset --hard origin/main
 
           git merge --no-ff "$TEMP_BRANCH" \
             -m "Merge changelog updates"
 
-          git push origin master
+          git push origin main
 
           git push origin --delete "$TEMP_BRANCH" || true
 
@@ -370,27 +370,27 @@ jobs:
           # Push temporary branch
           git push origin HEAD:$TEMP_BRANCH
 
-          # Rebase temp branch onto latest master
-          git fetch origin master
+          # Rebase temp branch onto latest main
+          git fetch origin main
 
           git checkout "$TEMP_BRANCH"
 
-          if ! git rebase origin/master; then
+          if ! git rebase origin/main; then
             echo "[WARN] Rebase failed, using merge instead."
             git rebase --abort || true
-            git merge origin/master --no-edit
+            git merge origin/main --no-edit
           fi
 
           git push origin HEAD:$TEMP_BRANCH --force
 
-          # Merge into master
-          git checkout master
-          git reset --hard origin/master
+          # Merge into main
+          git checkout main
+          git reset --hard origin/main
 
           git merge --no-ff "$TEMP_BRANCH" \
             -m "Merge build-info updates"
 
-          git push origin master
+          git push origin main
 
           git push origin --delete "$TEMP_BRANCH" || true