Repository navigation
Fix #323: Always accept local changes to resolve merge conflicts #325
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.
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
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -130,9 +130,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 | ||||||
|
|
@@ -227,9 +230,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 | ||||||
|
||||||
| git cherry-pick -n -m1 -Xtheirs stash | |
| git stash pop |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.