From 698ccbc55b165e5e3dac20260d22e9a72bf9eafc Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 27 Nov 2025 10:27:58 +0000 Subject: [PATCH] adding upstream sync for main branch --- .github/workflows/sync.yml | 2 +- develop | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 develop diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 8f68c5954..38a4cb3d8 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -32,7 +32,7 @@ jobs: git fetch upstream # Merge from upstream/develop with merge strategy to keep translation in case of conflicts - git merge -X ours upstream/develop + git merge -X ours upstream/main # this is dangerous but will essentially remove any files not staged in the merge # this is useful since the merge strategy `-X ours` will not handle files where diff --git a/develop b/develop deleted file mode 100644 index b405e31ad..000000000 --- a/develop +++ /dev/null @@ -1,3 +0,0 @@ -branch_name=develop -branch_name=develop -branch_name=develop