wjones127 commented on PR #34616: URL: https://github.com/apache/arrow/pull/34616#issuecomment-1527950165
Hi @tolleybot. Looks like there may have been some conflicts. I'd recommend squashing your commits and then rebasing on main. You can do that with: ```shell git checkout main && git pull git checkout dataset_encryption git rebase -i main ``` Choose squash for all but the last of your commits. Then fix any merge conflicts and commit the changes. -- 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]
