Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdboom merged 1 commit into from
Jan 9, 2025
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 9 additions & 18 deletions bench_runner/templates/_benchmark.src.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down