Versions Compared

Old Version 11

changes.mady.by.user Nazeer Shaik

Saved on

compared with

New Version Current

changes.mady.by.user James Dailey

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

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:

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

# if you see a reference to incubator-fineract.git in documentation, that is a deprecated repo. Do not use.


Tip

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

git branch -l # lists local repos with active one highlighted 
git branch -r # lists the repos on remote (for most that will be origin) 

Fetching a pull request

Code Block
languagebash
# 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]

...