Skip to content
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

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

Merged
merged 4 commits into from
Jan 9, 2025
+18 −9
Merged

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

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce657e4
Fix #323: Always accept local changes to resolve merge conflicts
mdboom Jan 7, 2025
22f9d42
Update bench_runner/templates/_benchmark.src.yml
mdboom Jan 7, 2025
c7a330e
Actually do a pull
mdboom Jan 8, 2025
cfb9c28
Merge branch 'main' into handle-merge-conflicts
mdboom Jan 8, 2025
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
24 changes: 15 additions & 9 deletions bench_runner/templates/_benchmark.src.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,11 @@ 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 cherry-pick -n -m1 -Xtheirs stash
mdboom marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Preview

Copilot AI Jan 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The use of 'git cherry-pick -n -m1 -Xtheirs stash' is unusual and may not work as intended. Consider using 'git stash pop' or 'git stash apply' instead.

Suggested change
git cherry-pick -n -m1 -Xtheirs stash
git stash pop

Copilot is powered by AI, so mistakes are possible. Review output carefully before use.

Positive Feedback
Negative Feedback

Provide additional feedback

Please help us improve GitHub Copilot by sharing more details about this comment.

Please select one or more of the options
- name: Add data to repo
if: ${{ steps.should_run.outputs.should_run != 'false' }}
uses: EndBug/add-and-commit@v9
Expand Down Expand Up @@ -227,9 +229,11 @@ 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 cherry-pick -n -m1 -Xtheirs stash
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we also need to pull here and below?

Suggested change
git stash
git cherry-pick -n -m1 -Xtheirs stash
git stash
git pull -s recursive --rebase
git cherry-pick -n -m1 -Xtheirs stash

Copy link
Preview

Copilot AI Jan 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The use of 'git cherry-pick -n -m1 -Xtheirs stash' is unusual and may not work as intended. Consider using 'git stash pop' or 'git stash apply' instead.

Suggested change
git cherry-pick -n -m1 -Xtheirs stash
git stash pop

Copilot is powered by AI, so mistakes are possible. Review output carefully before use.

Positive Feedback
Negative Feedback

Provide additional feedback

Please help us improve GitHub Copilot by sharing more details about this comment.

Please select one or more of the options
- 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 @@ -321,9 +325,11 @@ 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 cherry-pick -n -m1 -Xtheirs stash
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
git stash
git cherry-pick -n -m1 -Xtheirs stash
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
Expand Down
Loading