diff --git a/.github/workflows/i18n-push.yaml b/.github/workflows/i18n-push.yaml index fb590bcff..a99ab0182 100644 --- a/.github/workflows/i18n-push.yaml +++ b/.github/workflows/i18n-push.yaml @@ -25,13 +25,8 @@ jobs: - name: Setup i18n branch run: | - if ! git ls-remote --heads origin i18n | grep i18n; then - git checkout -b i18n - else - git fetch origin i18n - git checkout i18n - git merge origin/main - fi + git fetch origin i18n || true + git checkout -B i18n origin/i18n || git checkout -b i18n - name: Install dependencies uses: ./.github/workflows/actions/yarn-install