From c8946dcdc86b9fef057642da5252a913b6885976 Mon Sep 17 00:00:00 2001
From: Vasiliy Tolstov <v.tolstov@unistack.org>
Date: Sun, 4 May 2025 15:03:14 +0300
Subject: [PATCH] fix sync

---
 .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 646adee2..d0f7aa1f 100644
--- a/.github/workflows/job_sync.yml
+++ b/.github/workflows/job_sync.yml
@@ -23,7 +23,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 merge upstream/master
+        git pull --rebase upstream master
         git push upstream master --progress
         git push origin master --progress
         cd ../
@@ -34,7 +34,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 merge upstream/v3
+        git pull --rebase upstream v3
         git push upstream v3 --progress
         git push origin v3 --progress
         cd ../
@@ -45,7 +45,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 merge upstream/v4
+        git pull --rebase upstream v4
         git push upstream v4 --progress
         git push origin v4 --progress
         cd ../