pdxcodemonkey commented on pull request #697: URL: https://github.com/apache/geode-native/pull/697#issuecomment-742132516
Your PR is still set up to merge from your fork into the apache `feature/asio` branch, rather than `develop`. I think if you target `develop` the conflicts will be gone. ---------------------------------------------------------------- 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: [email protected]
