You are viewing a plain text version of this content. The canonical link for it is here.

Posted to github@arrow.apache.org by GitBox <gi...@apache.org> on 2020/08/11 16:36:51 UTC

[GitHub] [arrow] kszucs commented on pull request #7933: [Release] Cherry-pick commits to 1.0.x maintenance branch

kszucs commented on pull request #7933:
URL: https://github.com/apache/arrow/pull/7933#issuecomment-672077311


   I was using `-X theirs` during the cherry-pick which I'm going to remove to have explicit resolution about possible cherry-pick conflicts.


----------------------------------------------------------------
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:
users@infra.apache.org