Fix: translate branch update from master (#77)

ss220club · Apr 15, 2024 · 7dc8ec4 · 7dc8ec4
1 parent 344b117
commit 7dc8ec4
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.github/workflows/translate_branch_update.yml b/.github/workflows/translate_branch_update.yml
@@ -25,6 +25,8 @@ jobs:
 
       - name: Merge with their incoming
         run: |
+        git checkout origin/translate
         git merge origin/master --strategy-option theirs
+        git push