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: