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;
<a
href="https://help.github.com/articles/using-pull-requests";>https://help.github.com/articles/using-pull-requests</a>
+ 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.
</p>
+ <p>
+ The infrastructure team is working on Pull Request support on the
GitHub servers directly, but it is not
+ available by default yet.
+ </p>
+ <p>
+ Example, for pull request 42, you would need to do the following;
+<pre><code>
+# 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
+
+</code></pre>
+ </p>
</div>
<div class="span2"></div>
</div>
