Actually do a pull

Author: mdboom

bench_runner/templates/_benchmark.src.yml

@@ -234,6 +234,7 @@ jobs:
           # happened in the meantime.
           # https://stackoverflow.com/questions/43770520/how-to-specify-default-merge-strategy-on-git-stash-pop
           git stash
+          git pull -s recursive --rebase
           git cherry-pick -n -m1 -Xtheirs stash
       - name: Adding data to repo
         if: ${{ steps.should_run.outputs.should_run != 'false' && !inputs.perf }}
@@ -330,6 +331,7 @@ jobs:
           # happened in the meantime.
           # https://stackoverflow.com/questions/43770520/how-to-specify-default-merge-strategy-on-git-stash-pop
           git stash
+          git pull -s recursive --rebase
           git cherry-pick -n -m1 -Xtheirs stash
       - name: Add data to repo
         if: ${{ steps.should_run.outputs.should_run != 'false' }}