From b269de4aa6d2d392df6dd5c36058ebd269524011 Mon Sep 17 00:00:00 2001
From: Michael Droettboom <mdboom@gmail.com>
Date: Thu, 9 Jan 2025 13:22:10 -0500
Subject: [PATCH] Revert "Fix #323: Always accept local changes to resolve
 merge conflicts"

---
 bench_runner/templates/_benchmark.src.yml | 27 ++++++++---------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/bench_runner/templates/_benchmark.src.yml b/bench_runner/templates/_benchmark.src.yml
index 5a084875..0c2f72a4 100644
--- a/bench_runner/templates/_benchmark.src.yml
+++ b/bench_runner/templates/_benchmark.src.yml
@@ -133,12 +133,9 @@ 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 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
+          # 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
       - name: Add data to repo
         if: ${{ steps.should_run.outputs.should_run != 'false' }}
         uses: EndBug/add-and-commit@v9
@@ -240,12 +237,9 @@ 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 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
+          # 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
       - name: Adding data to repo
         if: ${{ steps.should_run.outputs.should_run != 'false' && !inputs.perf }}
         uses: EndBug/add-and-commit@v9
@@ -345,12 +339,9 @@ 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 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
+          # 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
       - name: Add data to repo
         if: ${{ steps.should_run.outputs.should_run != 'false' }}
         uses: EndBug/add-and-commit@v9