Versions Compared

Old Version 11

changes.mady.by.user Aaron Mihalik

Saved on

compared with

New Version 12

changes.mady.by.user Aaron Mihalik

Saved on

Key

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

...

Step 2: Rebase the branch to develop and test the changes.

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

Step 4: Delete PR branch.

 

The Example below demonstrates merging in a pull request from GitHub into the Apache Rya-Incubator repository. This specific Pull Request used for this example is here. 

...

Step 2.2: Test the changes

mvn clean install

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

git checkout develop
git merge input_format_fix
git push origin develop

Step 4: Delete PR branch.

git branch -D input_format_fix

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

...