[auto-merge] branch-0.2 to branch-0.3 [skip ci] [bot] #699
Conversation
This file contains 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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
As spark version 3.0.1 has been released, change shims dependency from 3.0.1-SNAPSHOT to 3.0.1 Signed-off-by: Tim Liu <timl@nvidia.com> Co-authored-by: Tim Liu <timl@nvidia.com>
Signed-off-by: Robert (Bobby) Evans <bobby@apache.org>
* support auto-merge on protected branch Signed-off-by: Peixin Li <pxli@nyu.edu>
github-actions
bot
requested review from
GaryShen2008,
jlowe,
NvTimLiu,
revans2 and
tgravescs
as code owners
|
FAILURE - Unable to auto-merge due to conflicts. Manual operation is required. To maintainers, please use the following steps to fix the merge conflicts manually: git fetch <spark-rapids_remote>
git checkout -b branch-0.3-merge-branch-0.2 <spark-rapids_remote>/branch-0.3
git merge <spark-rapids_remote>/branch-0.2
# fix the merge conflict, then
git commit -am "merge branch-0.2 to branch-0.3"
git push <your forked remote> branch-0.3-merge-branch-0.2When this is done, create a PR targets the base branch ( |
|
close the PR. Commits will be carried in next auto-merge PR w/ new |
tgravescs
pushed a commit
to tgravescs/spark-rapids
that referenced
this pull request
Nov 30, 2023
…IDIA#699) Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com> Signed-off-by: spark-rapids automation <70000568+nvauto@users.noreply.github.com>
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.
auto-merge triggered by github actions on
branch-0.2to create a PR keepingbranch-0.3up-to-date. If this PR is unable to be merged due to conflicts, it will remain open until manually fix.