Page History

...

Step 0: Clone and Update your local copy of Apache Rya-Incubator repository

Step 1: Check out a new branch that starts from develop and reference the Jira Ticket Number Add a remote to the fork referenced in the PR and fetch the branch in the PR.

Step 2: Pull in the changes from the GitHub Pull Request and  Rebase the branch to develop and test the changes.

Step 3: Merge the changes back into develop, and push changes Push changes to develop back to Apache.

...

git checkout develop
git pull

Step 1: Check out a new branch that starts from develop and reference the Jira Ticket Number.

git checkout -b RYA-3 develop

Step 2: Pull in the changes from the GitHub Pull Request and test the changes.  Note that in the example, the GitHub Pull Request is from the amihalik GitHub repo, and from the mihalik/RYA-3 branch.

...

 Add a remote to the fork referenced in the PR and fetch the branch in the PR

git remote add jej2003 https://github.com/

...

jej2003/incubator-rya.git
git fetch jej2003 input_format_fix
git checkout input_format_fix 

Step 2: Rebase the branch to develop.

git rebase developgit mihalik/RYA-3

Step 2.1: Test the License Requirements

...

Step 2.2: Test the changes

mvn clean install

Step 3: Merge the changes back into develop, and push changes  Push changes to develop back to Apache.

...

git push origin develop

Note that this will automatically close the Pull Request in GitHub. You will have to manually close the issue in Jira.

...