Update update.yml

TurnipTales · May 30, 2024 · 7f32283 · 7f32283
1 parent 922ac6b
commit 7f32283
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -49,7 +49,7 @@ jobs:
         run: git fetch upstream master
 
       - name: Pull upstream master branch
-        run: git rebase upstream master
+        run: git merge upstream/master
 
       - name: Push to GitHub
         run: git push