Github user davinash commented on the issue:
https://github.com/apache/incubator-geode/pull/291
@metatype Thanks for the review,
I think I messed up in my local git repo. I am always getting
```
~/source/open/incubator-geode (feature/GEODE-1122) $ git flow feature
finish -rF GEODE-1122
Branches 'develop' and 'origin/develop' have diverged.
Fatal: Branches need merging first.
```
I tried rebase and other solutions, but nothing is working.
Could you please help this time to merge this change to develop.
---
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.
---
