Merge pull request #325 from faster-cpython/handle-merge-conflicts

Fix #323: Always accept local changes to resolve merge conflicts

Author: mdboom

bench_runner/templates/_benchmark.src.yml

@@ -132,9 +132,12 @@ jobs:
         run: |
           # Another benchmarking task may have created results for the same
           # commit while the above was running. This "magic" incantation means
-          # that any local results for this commit will override anything we
-          # just pulled in in that case.
-          git pull -s recursive -X ours --autostash --rebase
+          # that any local results for this commit will override anything that
+          # 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' }}
         uses: EndBug/add-and-commit@v9
@@ -236,9 +239,12 @@ jobs:
         run: |
           # Another benchmarking task may have created results for the same
           # commit while the above was running. This "magic" incantation means
-          # that any local results for this commit will override anything we
-          # just pulled in in that case.
-          git pull -s recursive -X ours --autostash --rebase
+          # that any local results for this commit will override anything that
+          # 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 }}
         uses: EndBug/add-and-commit@v9
@@ -338,9 +344,12 @@ jobs:
         run: |
           # Another benchmarking task may have created results for the same
           # commit while the above was running. This "magic" incantation means
-          # that any local results for this commit will override anything we
-          # just pulled in in that case.
-          git pull -s recursive -X ours --autostash --rebase
+          # that any local results for this commit will override anything that
+          # 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' }}
         uses: EndBug/add-and-commit@v9