zhengruifeng opened a new pull request, #58521: URL: https://github.com/apache/spark/pull/58521
### What changes were proposed in this pull request? Record the target branch's HEAD before starting a cherry-pick. After a conflict is resolved, continue the cherry-pick in the merge script only when HEAD is unchanged. If the committer already completed the cherry-pick manually, proceed with the backport instead of invoking `git cherry-pick --continue` a second time. ### Why are the changes needed? Git tells committers resolving a cherry-pick conflict to run `git cherry-pick --continue`. If they follow that instruction before returning to the merge script, the script currently tries to continue the already-completed cherry-pick and fails with `no cherry-pick or revert in progress`. ### Does this PR introduce _any_ user-facing change? Yes, for Spark committers using `dev/merge_spark_pr.py`. The script now accepts an already-completed manual conflict resolution. This only changes unreleased committer tooling. ### How was this patch tested? Ran `git diff --check`. Ran `dev/merge_spark_pr.py --dry-run 58404`, selected `branch-4.2`, reproduced the cherry-pick conflict, resolved it, and manually ran `git cherry-pick --continue`. The script detected the new HEAD, skipped its second `--continue`, reached the dry-run push, restored the original branch, and exited successfully without external changes. ### Was this patch authored or co-authored using generative AI tooling? Generated-by: OpenAI Codex (GPT-5) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
