Github user pivotal-jbarrett commented on the issue: https://github.com/apache/geode-native/pull/90 You shouldn't merge develop into your feature branch. You should rebase your feature branch on develop. This creates a much cleaner merge of the feature back into develop when approved.
--- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---