[jira] [Resolved] (SPARK-58734) Skip a declined cherry-pick instead of aborting the merge in merge_spark_pr.py

["Uroš Bojanić (Jira)" <ji...@apache.org>]

     [ https://issues.apache.org/jira/browse/SPARK-58734?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Uroš Bojanić resolved SPARK-58734.
----------------------------------
    Fix Version/s: 5.0.0
       Resolution: Fixed

Issue resolved by pull request 57959
[https://github.com/apache/spark/pull/57959]

> Skip a declined cherry-pick instead of aborting the merge in merge_spark_pr.py
> ------------------------------------------------------------------------------
>
>                 Key: SPARK-58734
>                 URL: https://issues.apache.org/jira/browse/SPARK-58734
>             Project: Spark
>          Issue Type: Improvement
>          Components: Project Infra
>    Affects Versions: 5.0.0
>            Reporter: Uroš Bojanić
>            Assignee: Uroš Bojanić
>            Priority: Major
>              Labels: pull-request-available
>             Fix For: 5.0.0
>
>
> merge_spark_pr.py aborts the entire merge (skipping the JIRA-resolution step and exiting non-zero) when the committer declines to resolve a conflicting backport cherry-pick, even though the merge into the target branch has already been pushed. Since backport conflicts are routine, declining a cherry-pick fix-up should skip only that branch and let the merge continue to any further cherry-picks and to JIRA resolution.



--
This message was sent by Atlassian Jira
(v8.20.10#820010)

---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@spark.apache.org
For additional commands, e-mail: issues-help@spark.apache.org