From 8ab36ec5d268b8be2d4101e036924b9225065f33 Mon Sep 17 00:00:00 2001 From: Luke Davis Date: Wed, 4 Sep 2024 01:00:29 -0400 Subject: [PATCH] and again... --- .github/workflows/mergeTranslations.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/mergeTranslations.yaml b/.github/workflows/mergeTranslations.yaml index dd47797..ba4fb87 100644 --- a/.github/workflows/mergeTranslations.yaml +++ b/.github/workflows/mergeTranslations.yaml @@ -23,7 +23,9 @@ jobs: #git pull git remote add l10n https://github.com/nvdaaddons/addonUpdater git fetch l10n - git merge --ff -m "Translations automerge" l10n/stable + git checkout stable + git checkout main + git merge --ff -m "Translations automerge" stable - name: Fix problem directories run: | for badDir in $(find addon/locale -name '*add-ons'); do \