Repository navigation
Fix #323: Always accept local changes to resolve merge conflicts - #325
Merged
Merged
Conversation
mpage
reviewed
Jan 7, 2025
Co-authored-by: mpage <mpage2@fb.com>
mpage
reviewed
Jan 8, 2025
Comment on lines
+236
to
+237
| git stash | ||
| git cherry-pick -n -m1 -Xtheirs stash |
Collaborator
There was a problem hiding this comment.
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 |
Comment on lines
+332
to
+333
| git stash | ||
| git cherry-pick -n -m1 -Xtheirs stash |
Collaborator
There was a problem hiding this comment.
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 |
Contributor
There was a problem hiding this comment.
Copilot reviewed 1 out of 1 changed files in this pull request and generated 2 comments.
Comments suppressed due to low confidence (1)
bench_runner/templates/_benchmark.src.yml:335
- 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.
git cherry-pick -n -m1 -Xtheirs stash
| # 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 |
There was a problem hiding this comment.
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 |
| # 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 |
There was a problem hiding this comment.
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 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Cc: @mpage