alamb commented on pull request #1142: URL: https://github.com/apache/arrow-datafusion/pull/1142#issuecomment-947545340
> Out of curiosity, when you say "rebase against master", do you mean git rebase or git merge? I just wanted to clarify since I know git rebase clobbers the commit history and can make things harder to review. TLDR you are right that `git merge` might be a better suggestion I think I was using `git rebase` because of some long time again when a `git merge` in the github ui showed all commits that were merged in even if they weren't part of the PR. Since we squash into a single commit on merge anyway, I don't think it makes any difference to the final result Sorry for any confusion -- 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]
