nchammas commented on PR #58136: URL: https://github.com/apache/spark/pull/58136#issuecomment-5371712660
Hmm, I had an interesting problem when cherry picking this onto `branch-4.x`. There was a merge conflict; I resolved it manually in my IDE (VS Code) and proceeded. The commit message stripped lines starting with `#`. I think it did that because `git cherry-pick --continue` triggers the [default `commit.cleanup` behavior][1] which strips whitespace, unlike `commit -m` which preserves it. A manual fix would be for the operator to call `git -c commit.cleanup=whitespace cherry-pick --continue`, which would preserve whitespace. [1]: https://git-scm.com/docs/git-config#Documentation/git-config.txt-commitcleanup -- 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]
