You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by Apache Wiki <wi...@apache.org> on 2013/09/18 17:00:54 UTC
[Cordova Wiki] Update of "ProcessingPullRequests" by AndrewGrieve
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Cordova Wiki" for change notification.
The "ProcessingPullRequests" page has been changed by AndrewGrieve:
https://wiki.apache.org/cordova/ProcessingPullRequests?action=diff&rev1=1&rev2=2
=== Step 3: Merge the change ===
Run the following:
{{{#!sh
- git remote add foo git://github.com/TheirUserName/cordova-docs.git
- git fetch foo
- git cherry-pick 5d3e1b6 # For each commit ID in their branch.
+ # REPO_NAME example: "js"
+ # PULL_REQUEST_NUMBER example: "44"
+ curl https://github.com/apache/cordova-REPO_NAME/pull/PULL_REQUEST_NUMBER.patch | git am
git rebase origin/master -i
}}}
- The last step will let you interactively review the changes being made to master. You should:
+ The rebase step will let you interactively review the changes being made to master. You should:
* Squash as many commits as is reasonable together.
* Re-write commit messages to include JIRA issue numbers in the form [CB-####]