diff options
| author | Tekkub <tekkub@github.com> | 2011-05-26 13:14:46 -0700 |
|---|---|---|
| committer | Tekkub <tekkub@github.com> | 2011-05-26 13:14:46 -0700 |
| commit | ab15aa9ca6d603fd916c6a66f0e002da09b05533 (patch) | |
| tree | 71cbe330b1a45400e1b9df1a720899bbff59fb59 | |
| parent | e81e0d221e84e84a131aa59dc96d56f912a39784 (diff) | |
| parent | 6da0a24834870a2405a0d483fc759e19c9f897a2 (diff) | |
Merge pull request #27 from catchamonkey/gh-pages
Added a small section on the auto merge button
| -rw-r--r-- | _posts/2010-08-29-pull-requests.md | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/_posts/2010-08-29-pull-requests.md b/_posts/2010-08-29-pull-requests.md index 78a9238..f1a3737 100644 --- a/_posts/2010-08-29-pull-requests.md +++ b/_posts/2010-08-29-pull-requests.md @@ -186,7 +186,7 @@ preformatted text blocks, and other formatting supported by Markdown. Once the pull request is deemed satisfactory, someone with push access to the destination repository must apply the changes and push the updated branch. -There are a variety of ways to accomplish this. Two popular methods are +There are a variety of ways to accomplish this. Three popular methods are described below. #### Fetch and Merge @@ -219,6 +219,12 @@ to feed into the `git-am` command: <span>$</span> git push origin master </pre> +#### Auto Merge + +In many cases it is possible to ask github to auto merge a pull request using +the merge button. This was made possible with the launch of Pull Requests 2.0 +and is covered in the [related blog post](https://github.com/blog/843-the-merge-button). + ## Closing a Pull Request Pull Requests are automatically closed when the requested commits are merged |