Return-Path:
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
by cust-asf2.ponee.io (Postfix) with ESMTP id 70AB9200B11
for ; Mon, 13 Jun 2016 11:29:24 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
id 6F50B160A3C; Mon, 13 Jun 2016 09:29:24 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
by cust-asf.ponee.io (Postfix) with SMTP id B621C160A19
for ; Mon, 13 Jun 2016 11:29:23 +0200 (CEST)
Received: (qmail 41280 invoked by uid 500); 13 Jun 2016 09:29:22 -0000
Mailing-List: contact commits-help@zest.apache.org; run by ezmlm
Precedence: bulk
List-Help:
List-Unsubscribe:
List-Post:
List-Id:
Reply-To: dev@zest.apache.org
Delivered-To: mailing list commits@zest.apache.org
Received: (qmail 41271 invoked by uid 99); 13 Jun 2016 09:29:22 -0000
Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142)
by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Jun 2016 09:29:22 +0000
Received: from localhost (localhost [127.0.0.1])
by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 58C1AC0713
for ; Mon, 13 Jun 2016 09:29:22 +0000 (UTC)
X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org
X-Spam-Flag: NO
X-Spam-Score: -0.426
X-Spam-Level:
X-Spam-Status: No, score=-0.426 tagged_above=-999 required=6.31
tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.426]
autolearn=disabled
Received: from mx2-lw-eu.apache.org ([10.40.0.8])
by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024)
with ESMTP id IxDHTwV32Hop for ;
Mon, 13 Jun 2016 09:29:20 +0000 (UTC)
Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139])
by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with ESMTP id 0DFDC5F2F2
for ; Mon, 13 Jun 2016 09:29:20 +0000 (UTC)
Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6])
by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 30148E00E7
for ; Mon, 13 Jun 2016 09:29:19 +0000 (UTC)
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 2CC353A02FD
for ; Mon, 13 Jun 2016 09:29:19 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1748154 - /zest/site/src/community/codebase.html
Date: Mon, 13 Jun 2016 09:29:19 -0000
To: commits@zest.apache.org
From: niclas@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20160613092919.2CC353A02FD@svn01-us-west.apache.org>
archived-at: Mon, 13 Jun 2016 09:29:24 -0000
Author: niclas
Date: Mon Jun 13 09:29:18 2016
New Revision: 1748154
URL: http://svn.apache.org/viewvc?rev=1748154&view=rev
Log:
Added some description about how to handle pull requests.
Modified:
zest/site/src/community/codebase.html
Modified: zest/site/src/community/codebase.html
URL: http://svn.apache.org/viewvc/zest/site/src/community/codebase.html?rev=1748154&r1=1748153&r2=1748154&view=diff
==============================================================================
--- zest/site/src/community/codebase.html (original)
+++ zest/site/src/community/codebase.html Mon Jun 13 09:29:18 2016
@@ -272,8 +272,42 @@ layout: default
Github's guide to Pull Requests walks through the process of sending a hypothetical pull request and using
the various code review and management tools to take the change to completion. This guide can be found here;
https://help.github.com/articles/using-pull-requests
+ That article assume that we have direct control of the GitHub repository, but we don't. Instead we need to
+ pull the Pull Request to our local machine, merge it in and then push it back via the Apache GIT server.
+
+ The infrastructure team is working on Pull Request support on the GitHub servers directly, but it is not
+ available by default yet.
+
+
+ Example, for pull request 42, you would need to do the following;
+
+# You need to have a "remote" defined in your git configuration
+# This is only needed once
+git remote add github https://github.com/apache/zest-java.git
+
+# Fetch the commit
+git fetch github pull/42/head:merge-pr-42
+
+# These next two steps are optional.
+# If you choose to rebase, then the Pull Request is not automatically closed.
+git checkout merge-pr-42
+git rebase develop
+
+# Check out 'develop' branch
+git checkout develop
+# Merge the PR
+git merge merge-pr-42
+
+# Remove the PR branch
+git branch -D merge-pr-42
+
+# Push the result
+git push origin develop
+
+
+