Differences

This shows you the differences between two versions of the page.

--- mission:log:2014:12:19:howto-fetch-test-and-merge-github-pull-requests-locally-via-commandline [2014-12-19 12:09] – created chrono
+++ mission:log:2014:12:19:howto-fetch-test-and-merge-github-pull-requests-locally-via-commandline [2014-12-24 07:53] (current) – [Step 3: Merge the pull-request] chrono
@@ Line 17: / Line 17: @@
 </code>
-Now we just have to add another fetch target so our git knows where to fetch pr's from github:
+We just have to add another fetch target so our git knows where to fetch pr's from github:
 **fetch = +refs/pull/*/head:refs/remotes/origin/pr/***
@@ Line 62: / Line 62: @@
 ==== Step 3: Merge the pull-request ====
-Once testing is finished and everything seems to be in order, we merge the pull request into the branch we want, in this case the master branch, so let's checkout master.
+Once testing is finished and everything seems to be in order, we merge the pull request into the branch we want, in this case the master branch, so let's checkout master:
 <code>
@@ Line 68: / Line 68: @@
 </code>
-And finally we merge the pull request into the master branch and since github already told us that it could merge the PR automatically we don't expect to be confronted with any merge conflicts:
+Finally we merge the pull request into the master branch and since github already told us that it could merge the PR automatically, we don't expect to be confronted with any merge conflicts:
 <code>