Versions Compared

Key

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

...

origin git@github.com:<user>/incubator-samoa.git (fetch)
origin git@github.com:<user>/incubator-samoa.git (push))
upstream git@github.com:apache/incubator-samoa.git (fetch)
upstream git@github.com:apache/incubator-samoa.git (push)

Create a pull request (PR)

To propose a modification to SAMOA, first create a JIRA issue describing the bug or enhancement at https://issues.apache.org/jira/browse/SAMOA (you need a separate JIRA account).

For committers

Setup the apache remote

As a committer, you have write access to the official Apache git repository. You need to setup a remote pointing to it in order to commit changes.

git remote add apache git://git.apache.org/incubator-samoa.git
git remote -v
apache git://git.apache.org/incubator-samoa.git (fetch)
apache git://git.apache.org/incubator-samoa.git (push)
origin git@github.com:<user>/incubator-samoa.git (fetch)
origin git@github.com:<user>/incubator-samoa.git (push))
upstream git@github.com:apache/incubator-samoa.git (fetch)
upstream git@github.com:apache/incubator-samoa.git (push)

If you have troubles using the git repository, you can try with the https address.

git remote add apache https://git-wip-us.apache.org/repos/asf/incubator-samoa.git

Fetch pull requests automatically

If you review many pull requests, you can setup your git clone to automatically fetch the pull requests from the upstream remote.

git config --add remote.upstream.fetch '+refs/pull/*/head:refs/remotes/upstream/pr/*'
git fetch upstream
remote: Counting objects: 554, done.
remote: Compressing objects: 100% (58/58), done.
remote: Total 554 (delta 67), reused 40 (delta 40), pack-reused 456
Receiving objects: 100% (554/554), 101.94 KiB | 0 bytes/s, done.
Resolving deltas: 100% (170/170), done.
From github.com:apache/incubator-samoa
* [new ref] refs/pull/1/head -> upstream/pr/1
* [new ref] refs/pull/2/head -> upstream/pr/2
* [new ref] refs/pull/3/head -> upstream/pr/3
* [new ref] refs/pull/4/head -> upstream/pr/4
* [new ref] refs/pull/5/head -> upstream/pr/5
* [new ref] refs/pull/6/head -> upstream/pr/6
* [new ref] refs/pull/7/head -> upstream/pr/7
* [new ref] refs/pull/8/head -> upstream/pr/8
* [new ref] refs/pull/9/head -> upstream/pr/9

Source: https://gist.github.com/piscisaureus/3342247

Merge a pull request

...

 (note that in SAMOA's case pull requests come to the upstream remote rather than the origin one).