From 7ff7a3dbe0f89e21dd5f0f06c8b481b9ff5190f8 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Tue, 29 Apr 2025 18:29:26 +0300 Subject: [PATCH] update all Signed-off-by: Vasiliy Tolstov --- .github/workflows/job_sync.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/job_sync.yml b/.github/workflows/job_sync.yml index 135101c9..c2b09d48 100644 --- a/.github/workflows/job_sync.yml +++ b/.github/workflows/job_sync.yml @@ -28,7 +28,7 @@ jobs: git clone --filter=blob:none --filter=tree:0 --branch master --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo cd repo git remote add --no-tags --fetch --track master upstream https://github.com/${GITHUB_REPOSITORY} - git rebase upstream/master + git merge upstream/master git push upstream master --progress git push origin master --progress cd ../ @@ -39,7 +39,7 @@ jobs: git clone --filter=blob:none --filter=tree:0 --branch v3 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo cd repo git remote add --no-tags --fetch --track v3 upstream https://github.com/${GITHUB_REPOSITORY} - git rebase upstream/v3 + git merge upstream/v3 git push upstream v3 --progress git push origin v3 --progress cd ../ @@ -50,7 +50,7 @@ jobs: git clone --filter=blob:none --filter=tree:0 --branch v4 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo cd repo git remote add --no-tags --fetch --track v4 upstream https://github.com/${GITHUB_REPOSITORY} - git rebase upstream/v4 + git merge upstream/v4 git push upstream v4 --progress git push origin v4 --progress cd ../