HyukjinKwon commented on pull request #32168: URL: https://github.com/apache/spark/pull/32168#issuecomment-819961872
github conflict detection is less strict to `git rebase` given my experience. If we can manage it without `-ff` option, that would be great. If that's difficult, we can do rebase for the time being. -- 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. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
