From 6ef45c88571adc64a1a36dfd6c233b643bbd3bf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thor=20Anker=20Kvisg=C3=A5rd=20Lange?= Date: Fri, 14 Nov 2025 09:37:52 +0100 Subject: [PATCH 1/2] fix: Ignore 'git merge' exit code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thor Anker Kvisgård Lange --- .github/workflows/sync-upstream.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-upstream.yaml b/.github/workflows/sync-upstream.yaml index 92a76f392b..cc786228dd 100644 --- a/.github/workflows/sync-upstream.yaml +++ b/.github/workflows/sync-upstream.yaml @@ -31,7 +31,7 @@ jobs: echo "Latest upstream tag is ${LATEST_TAG}" # Merge the latest tag, but keep our version of the .github directory - git merge --no-commit upstream ${LATEST_TAG} + git merge --no-commit "upstream/${LATEST_TAG}" || true git reset HEAD .github rm -rf .github git checkout HEAD -- .github From 15fdb5880a4fbdc7d254182cc33efd30acc77ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thor=20Anker=20Kvisg=C3=A5rd=20Lange?= Date: Fri, 14 Nov 2025 09:39:05 +0100 Subject: [PATCH 2/2] chore: Fixin Gemini error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thor Anker Kvisgård Lange --- .github/workflows/sync-upstream.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-upstream.yaml b/.github/workflows/sync-upstream.yaml index cc786228dd..a058e1cbab 100644 --- a/.github/workflows/sync-upstream.yaml +++ b/.github/workflows/sync-upstream.yaml @@ -31,7 +31,7 @@ jobs: echo "Latest upstream tag is ${LATEST_TAG}" # Merge the latest tag, but keep our version of the .github directory - git merge --no-commit "upstream/${LATEST_TAG}" || true + git merge --no-commit upstream "${LATEST_TAG}" || true git reset HEAD .github rm -rf .github git checkout HEAD -- .github