nealrichardson commented on pull request #9950: URL: https://github.com/apache/arrow/pull/9950#issuecomment-816854949
Sorry @thisisnic, I just merged something that means you need to rebase and re-generate `arrowExports.cpp` (which should happen when you install the package and test anyway). Due to the nature of the change I made, you will have a conflict on that file. Don't worry about it, it's autogenerated. Don't bother to resolve that conflict, just close out of whatever diff resolution tool that `git` opens, re-generate `arrowExports.cpp`, and then do `git add r/src/arrowExports.cpp && git rebase --continue` to proceed. -- 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: us...@infra.apache.org
