HeartSaVioR edited a comment on issue #23757: [SPARK-24211][SPARK-24239][SQL][BRANCH-2.3] Fix streaming join/kafka continuous mode test flakiness on branch-2.3 URL: https://github.com/apache/spark/pull/23757#issuecomment-462235356 What I have in mind is like: ``` git checkout branch-2.3 git checkout -b branch-2.3-merging-23757 git pull https://github.com/HeartSaVioR/spark.git fix-streaming-join-test-flakiness-branch-2.3 git log # should contain a6662f27208622cdd63b2ce48fb336d14a488f17 / 079a83bd33cf38ed8a4ba1e5b41bc4c654cbf35c / ddd68fba8840f0191f9820aab2911390ace47c8d git checkout branch-2.3 git cherry-pick a6662f27208622cdd63b2ce48fb336d14a488f17 # cherry-pick either origin commits (7ec83658fbc88505dfc2d8a6f76e90db747f1292 / f4579332931c9bf424d0b6147fad89bd63da26f6) or cherry-picked commits (079a83bd33cf38ed8a4ba1e5b41bc4c654cbf35c / ddd68fba8840f0191f9820aab2911390ace47c8d) ``` I'm not sure what you meant, but if you mean we have to have explicit PR for cherry-picked commit (a6662f27208622cdd63b2ce48fb336d14a488f17) with modification, I'll just remove two commits from here, and sync PR's title and description to SPARK-23408 so that merge script would work. After that you could cherry pick origin commits for SPARK-23491/SPARK-23416. Did I understand you correctly?
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
