Author: pat
Date: Fri Jun 13 00:28:30 2014
New Revision: 1602318
URL: http://svn.apache.org/r1602318
Log:
describe committer closing their own PR
Modified:
mahout/site/mahout_cms/trunk/content/developers/github.mdtext
Modified: mahout/site/mahout_cms/trunk/content/developers/github.mdtext
URL:
http://svn.apache.org/viewvc/mahout/site/mahout_cms/trunk/content/developers/github.mdtext?rev=1602318&r1=1602317&r2=1602318&view=diff
==============================================================================
--- mahout/site/mahout_cms/trunk/content/developers/github.mdtext (original)
+++ mahout/site/mahout_cms/trunk/content/developers/github.mdtext Fri Jun 13
00:28:30 2014
@@ -82,7 +82,13 @@ Merging pull requests are equivalent to
git pull apache master # fast-forward to current remote HEAD
git pull --squash https://github.com/cuser/mahout cbranch # merge to
master
-Squash pull ensures all PR history is squashed into single commit, and allows
committer to use his/her own
+If you are ready to merge your own (committer's) PR you probably only need to
merge, since you have a local copy that you've been working on. This is the
branch that you used to create the PR.
+
+ git checkout master # switch to local master branch
+ git pull apache master # fast-forward to current remote HEAD
+ git merge --squash cbranch # cbranch here is probably named mahout-xxxx
for a Jira ticket
+
+--squash ensures all PR history is squashed into single commit, and allows
committer to use his/her own
message. Read git help for merge or pull for more information about `--squash`
option. In this example we assume that the contributor's Github handle is
"cuser" and the PR branch name is "cbranch".
Next, resolve conflicts, if any, or ask a contributor to rebase on top of
master, if PR went out of sync.
