diff --git a/.github/workflows/update-dev.yml b/.github/workflows/update-dev.yml
index 3fc4a7bee9..5464f47380 100644
--- a/.github/workflows/update-dev.yml
+++ b/.github/workflows/update-dev.yml
@@ -29,6 +29,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           token: ${{ secrets.NIGHTLY_TOKEN }}
+          fetch-depth: 0  # We want entire git-history to avoid any merge conflicts
 
       - name: Nightly Merge
         env:
@@ -45,10 +46,10 @@ jobs:
           git config --global user.email "$CONFIG_EMAIL"
 
           git fetch origin $MERGE_HEAD
-          (git checkout $MERGE_HEAD && git pull)
+          (git checkout $MERGE_HEAD && git pull origin $MERGE_HEAD)
 
           git fetch origin $MERGE_BASE
-          (git checkout $MERGE_BASE && git pull)
+          (git checkout $MERGE_BASE && git pull origin $MERGE_BASE)
 
           git merge $MERGE_ARGS $MERGE_HEAD
           git push origin $MERGE_BASE