Github user echobravopapa commented on the issue:
https://github.com/apache/geode-native/pull/90
@ameybarve15 it is simpler to start with a fresh feature branch and follow
what @pivotal-jbarrett suggests
---
If your project is set up for it, you can reply to this email and have your
Github user ameybarve15 commented on the issue:
https://github.com/apache/geode-native/pull/90
Ok, but for this branch I have already merged develop, Let me know If you
can merge this request in this state or else I will create a new branch again
and follow the entire procedure again
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
Github user ameybarve15 commented on the issue:
https://github.com/apache/geode-native/pull/90
Hi @echobravopapa , and @PivotalSarge Thanks for your review.
I am trying to merge my pull request but get this error.
>~/source/open/t/geode-native (develop) $ git fetch
Github user echobravopapa commented on the issue:
https://github.com/apache/geode-native/pull/90
@ameybarve15 @PivotalSarge will have a look at this soon.
May we stay on the feature branch until the PR is approved, which will
alleviate the "merge" commit...
---
If your
Github user ameybarve15 commented on the issue:
https://github.com/apache/geode-native/pull/90
@echobravopapa I am following
https://cwiki.apache.org/confluence/display/GEODE/Code+contributions
I can squash commits post pull request is approved.
---
If your project is set up
Github user echobravopapa commented on the issue:
https://github.com/apache/geode-native/pull/90
@ameybarve15 would you please squash your commits, TIA
---
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
