Page tree
Skip to end of metadata
Go to start of metadata

Merging a pull request for https://github.com/apache/fineract is not like merging pull requests for other GitHub repositories because the repository is actually just a mirror of the Apache-hosted repository.  This fact makes the steps a little unintuitive.  These instructions may help.

Keep in mind that the git credentials you need is your Apache login; not the GitHub credentials.

Step-by-step guide

  1. Clone the apache repo from https://git-wip-us.apache.org/repos/asf/fineract.git
  2. Checkout a new branch for the merge.
  3. Pull the pull request into your new branch.
  4. Test the changes.
  5. Merge the changes.
  6. Push to the apache repo.

<branch-name>= <forked-repo-name>-<ticket-name>

 

Commands for merging pull request
                  > git clone https://git-wip-us.apache.org/repos/asf/fineract.git
                  > cd fineract
                  > git checkout -b <branch-name> develop
                  > git pull https://github.com/<forked-reponame>/fineract.git <remote-branch-name>
(linux-only)      > chmod +x gradlew 
                  > ./gradlew build
(run tests)       > ./gradlew clean integrationTest    // Note: be sure to drop and re-add the mifostenant-default database before running tests
                  > git checkout develop
                  > git merge --no-ff <branch-name>

                  > git push origin develop

 

Closing a pull request without merging

  1. Clone the apache repo.
  2. Create an empty commit with a close message.
  3. Push to the apache repo.

 

Commands for merging pull request
                  > git clone https://git-wip-us.apache.org/repos/asf/fineract.git
                  > cd fineract
                  > git commit --allow-empty -m 'Close #116'
                  > git push origin develop