Github user shivaram commented on the issue:
https://github.com/apache/spark/pull/14734
It was mostly manual -- I ran `dev/merge_spark_pr` and it prompted me to
say the cherry-pick has conflicts. I then opened another terminal and found
that the conflicts were in 3 files. I manually fixed those three files, ran
`git add` and then `git cherrry-pick --continue` to finish the commit. Then I
came back to the script window to do the push.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
