Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: reformatted everything, did not change content. Added apache links.

...

Clone the canonical ASF repo using this command. The --origin option tells git to name the remote apache instead of the default, 
origin; this will reduce ambiguity when we later add a second remote upstream.:

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

Add a second remote, for the GitHub repository.:

  git remote add github https://github.com/apache/incubator-corinthia.git

For the GitHub remote, add an additional fetch reference which will cause every pull request to be made available as a remote 
branch in your workspace.:

{{  git config --local --add remote.github.fetch '+refs/pull/*/head:refs/remotes/github/pr/*'}}

Finally, run git fetch --all to update from all remote repositories - you will see all the pull requests appear:

{{[new ref]             refs/pull/98/head -> github/pr/98
  * [new ref]             refs/pull/99/head -> github/pr/99}}h3.

Merging a pull request

                   <p>Fetch  Fetch the latest remote branches, which will cause a remote branch for the PR to become available to you.                   <div class="panel">git

   git fetch --all

all</div>
                   If you want to inspect the PR and/or run tests, check out the branch:                       <div class

="panel">git   git checkout github/pr/1234

To 1234</div>
                <p>To perform the merge, first update your master branch to the latest:</p>                     <div class="

panel">git   git checkout master   git pull --rebase</div>
                   <p>Then rebase

Then merge and push:</p>

  git                    <div class="panel">git merge --no-ff -m 'This closes #1234' github/pr/1234 git push apache master

Note master</div>
                   <p>Note that this commit message is important, as this is what will trigger the pull request to be automatically closed, and the --no-ff means that a
                   merge merge commit will always be created.</p>
               <h3>Alternative options</h3>
              <h4 class="subheader">Adding

Alternative options

Adding the remote reference to the contributor' s repository

Fetch contributor’s repository</h4>
              <p>Fetch the branch of the user you want to merge from              <div class

="panel">git   git fetch https://github.com/user-to-merge-from/incubator-corinthia.git branch-to-merge-from

If from</div>
            <p>If you commonly merge from a particular user, you’ll you'll want to add their repo as a remote to make fetching branches easier.</p>

             <div class="panel">git   git remote add user-to-merge-from https://github.com/user-to-merge-from/incubator-corinthia.git             <br> git fetch

  git fetch user-to-merge-

...

from

Merging from a patch file

Save file</h3>
             <p>Save the patch from the Github patch link (just append ‘append .patch’ patch to the pull request link to get it). This patch will keep the authorship of the
            committhe commit, so we should use it instead of the diff. Apply the patch preserving the original author:</p>

             <div class="panel">git   git am pull-request-9876.patch</div>
             <h3>Additional information</h3>
     patch

Additional information

  Particularly         <p>Particularly for new committers, you may find the following information useful:</p>
                 <ul>
                      <li>Guide

  committers</li>
                     <li>Committers FAQ</li>
                     <li>Git at Apache</li>
                </ul>
          </div>
      </div>