Update sync.yml

Adityasinh-Sodha · Dec 31, 2024 · 65d69ad · 65d69ad
1 parent 7574297
commit 65d69ad
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
@@ -29,7 +29,7 @@ jobs:
         run: |
           git remote add gitlab https://Adityasinh-Sodha:$GITLAB_TOKEN@gitlab.com/Adityasinh-Sodha/Face-Recognition-System.git
           git fetch gitlab main
-          git rebase gitlab/main || git rebase --skip
+          git rebase --strategy=recursive --strategy-option=theirs gitlab/main || git rebase --skip
 
       - name: Push to GitLab
         env: