From 8a85989b795745c9fd9fee06054ec683bb94dbcc Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Tue, 29 Apr 2025 18:30:08 +0300 Subject: [PATCH] update all Signed-off-by: Vasiliy Tolstov --- .github/workflows/job_sync.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/job_sync.yml b/.github/workflows/job_sync.yml index 22de8d5..c2b09d4 100644 --- a/.github/workflows/job_sync.yml +++ b/.github/workflows/job_sync.yml @@ -27,8 +27,8 @@ jobs: run: | 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 --track master upstream https://github.com/${GITHUB_REPOSITORY} - git pull --rebase upstream master + git remote add --no-tags --fetch --track master upstream https://github.com/${GITHUB_REPOSITORY} + git merge upstream/master git push upstream master --progress git push origin master --progress cd ../ @@ -39,8 +39,8 @@ 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 pull --rebase upstream v3 - git push upstream v3 + git merge upstream/v3 + git push upstream v3 --progress git push origin v3 --progress cd ../ rm -rf repo @@ -50,8 +50,8 @@ 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 pull --rebase upstream v4 - git push upstream v4 + git merge upstream/v4 + git push upstream v4 --progress git push origin v4 --progress cd ../ rm -rf repo