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

After a contribution passed code review, it is time to pull the changes into the Apache Fineract repository, and merge it with the ongoing development effort.

Note: Once the PR has been merged, please make sure to mark the issue as 'Resolved' in Jira so that QA can validate the fix.

Initial Setup

Once you have cloned the Apache Git repository, add the GitHub mirror as a new remote reference:

# for web site changes, replace incubator-fineract.git with incubator-fineract-site.git
git remote add github https://github.com/apache/incubator-fineract.git

You can use git remote -v to list all available remote repositories.

Fetching a pull request

# Fetch a pull request
git fetch github pull/[number]/head:[localbranchname]
 
# Switch to develop branch
git checkout develop
 
# Merge the pulled feature branch
git merge [localbranchname]
 
# Run a build
gradlew clean build

# Run integration tests
gradlew clean integrationTest
 
# Push the changes
git push origin
 
# SKIP THIS STEP WHEN MERGING 'develop'
# delete the feature branch
git branch -d [localbranchname]
  • No labels