From f45f7c28f216a780cd2e2c1e47e80b83a924c7a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Malfait?= <felix.malfait@gmail.com>
Date: Fri, 14 Feb 2025 09:56:05 +0100
Subject: [PATCH] Improve i18n ci (#10209)

---
 .github/workflows/i18n-push.yaml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

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