houqp commented on pull request #971: URL: https://github.com/apache/arrow-datafusion/pull/971#issuecomment-923600737
@matthewmturner if you are not comfortable doing rebase, you can also do a simple `git pull` too to pull in the latest master change and resolve the conflicts locally on merge. We do squash merge on every PR, so it doesn't really matter if you do a rebase pull or merge pull in your local branch. -- 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]
