Skip to content

Commit 22f9d42

Browse files
mdboommpage
andauthored
Update bench_runner/templates/_benchmark.src.yml
Co-authored-by: mpage <[email protected]>
1 parent ce657e4 commit 22f9d42

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

bench_runner/templates/_benchmark.src.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ jobs:
134134
# happened in the meantime.
135135
# https://stackoverflow.com/questions/43770520/how-to-specify-default-merge-strategy-on-git-stash-pop
136136
git stash
137+
git pull -s recursive --rebase
137138
git cherry-pick -n -m1 -Xtheirs stash
138139
- name: Add data to repo
139140
if: ${{ steps.should_run.outputs.should_run != 'false' }}

0 commit comments

Comments
 (0)