Github user nazeer1100126 commented on the pull request:
https://github.com/apache/incubator-fineract/pull/65#issuecomment-214636806
I assume your git remote name is upstream.
Run these two commands
git fetch upstream
git rebase upstream/develop
It will get the latest code and try to merge with your changes. If merge
fails, it will show the files with conflicts.
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
