Update sync-gitlab.yml

m-elhamlaoui · May 26, 2024 · b134a79 · b134a79
1 parent 5b91206
commit b134a79
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/sync-gitlab.yml b/.github/workflows/sync-gitlab.yml
@@ -32,5 +32,5 @@ jobs:
         GITLAB_ACCESS_TOKEN: ${{ secrets.GITLAB_ACCESS_TOKEN }}
       run: |
         git remote add gitlab "https://oauth2:${GITLAB_ACCESS_TOKEN}@${GITLAB_REPO}"
-        git pull gitlab mvn-multimodules --strategy-option theirs
+        git pull gitlab mvn-multimodules
         git push gitlab mvn-multimodules