yaml syntax update

.github/workflows/pypi_upload.yml

@@ -17,6 +17,9 @@ jobs:
     name: Check if version.py is changed and update if the version.py is not changed
     steps:
       - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0        
+          token: ${{ github.token }}      
       - name: Get changed files
         id: changed-files-specific
         uses: tj-actions/changed-files@v32
@@ -27,30 +30,29 @@ jobs:
         if: steps.changed-files-specific.outputs.any_changed == 'false'
         run: |
           echo "Version file not changed, running script to change the version file."
-          git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
+          #git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
           python .github/scripts/update_version.py
           git config --global user.email "[email protected]"
           git config --global user.name "bsavitzky"
           git commit -a -m "Update version number"
           git push origin main
-        env:
-          token: ${{ github.token }}
   sync_with_dev:
     runs-on: ubuntu-latest
     name: Sync main with dev
     steps:
-      - uses: actions/checkout@v3
       - name: Sync main with dev
-        run: |
-          git pull --rebase origin main
-          git push origin dev
+        uses: actions/checkout@v3
         with:
           ref: dev
           fetch-depth: 0
           token: ${{ github.token }}
-        #with:
-        #  repo-token: ${{ secrets.GITHUB_TOKEN }}
-
+      - run: |
+          # set strategy to default merge
+          git config pull.rebase false
+          git config --global user.email "[email protected]"
+          git config --global user.name "bsavitzky"
+          git pull origin main --commit --no-edit
+          git push origin dev
   deploy:
     needs: update_version
     runs-on: ubuntu-latest