nchammas opened a new pull request, #58214: URL: https://github.com/apache/spark/pull/58214
### What changes were proposed in this pull request? When a conflict occurs on cherry picking a commit to a branch, ask the user to fix the conflict but have the script continue the cherry pick itself. ### Why are the changes needed? If the user calls `git cherry-pick --continue` themselves, it's likely that commit message lines starting with `#` will be interpreted as comments and stripped. This is [what happened here][1]. Compare the commit message on https://github.com/apache/spark/commit/9a75a1d04be4b82c0626f5ac00cb65b59cfdf37e (master) to https://github.com/apache/spark/commit/8cc56ea6006b4ea182df5ed4713ba345ea8e5e74 (branch-4.x) and note how every line beginning with `#` was stripped from the latter. [1]: https://github.com/apache/spark/pull/58136#issuecomment-5371712660 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? I'm honestly not sure how best to test this. ### Was this patch authored or co-authored using generative AI tooling? I wrote this with assistance from GitHub Copilot. -- 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]
