From c659580626e41ab7c916a83b5f77051087b9cb77 Mon Sep 17 00:00:00 2001
From: Adityasinh <work.adityasodha@gmail.com>
Date: Tue, 31 Dec 2024 19:53:33 +0530
Subject: [PATCH] Update sync.yml

---
 .github/workflows/sync.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
index 14176cf..0cbc6c9 100644
--- a/.github/workflows/sync.yml
+++ b/.github/workflows/sync.yml
@@ -28,7 +28,9 @@ jobs:
           GITLAB_TOKEN: ${{ secrets.GITLAB }}
         run: |
           git remote add gitlab https://Adityasinh-Sodha:$GITLAB_TOKEN@gitlab.com/Adityasinh-Sodha/MaxEdit.git
-          git pull gitlab main --rebase
+          git fetch gitlab main
+          git rebase gitlab/main || git rebase --skip
+
 
       - name: Push to GitLab
         env: