Versions Compared

Key

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

...

-a committer will look at it and integrate it in the code /or not

Commit Process for Committers:

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.

Step 2: Pull in the changes from the GitHub Pull Request and test the changes.

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

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 0.1: Clone the Apache Rya-Incubator repository

git clone https://git-wip-us.apache.org/repos/asf/incubator-rya.git incubator-rya-apache

Step 0.2: Update your repository

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.

git pull git@github.com:amihalik/incubator-rya.git mihalik/RYA-3

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

git checkout develop
git merge RYA-3
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.