diff --git a/.github/workflows/translate_branch_update.yml b/.github/workflows/translate_branch_update.yml index 8043cabae925e..754d0065afeab 100644 --- 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