Build merged code of HEAD and BASE branch for pre-merge [skip ci] #1414
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
Signed-off-by: Peixin Li <pxli@nyu.edu>
pxLi
requested review from
GaryShen2008,
jlowe,
NvTimLiu,
revans2 and
tgravescs
as code owners
|
build |
|
Going to force merge this one to validate the setup. tested in #1415, passed |
nartal1
pushed a commit
to nartal1/spark-rapids
that referenced
this pull request
Jun 9, 2021
Signed-off-by: Peixin Li <pxli@nyu.edu>
nartal1
pushed a commit
to nartal1/spark-rapids
that referenced
this pull request
Jun 9, 2021
Signed-off-by: Peixin Li <pxli@nyu.edu>
tgravescs
pushed a commit
to tgravescs/spark-rapids
that referenced
this pull request
Nov 30, 2023
…IDIA#1414) 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.
Signed-off-by: Peixin Li pxli@nyu.edu
Change the pre-merge build logic, to use the merged code (from the HEAD into BASE) to test the pre-merge. This should avoid case that PR has no merge conflict, but the HEAD branch was actually based on an incorrect BASE branch.
Tested in my forked repo.