Sync changes from upstream repository

Hubot · Hubot · commit 4d47e0d96a66 · 2015-04-07T15:03:00.000Z
diff --git a/content/v3/pulls.md b/content/v3/pulls.md
@@ -184,6 +184,7 @@ Note: The response includes a maximum of 250 commits. If you are working with a
 Name | Type | Description
 -----|------|-------------
 `commit_message`|`string`| The message that will be used for the merge commit
+`sha`|`string`| SHA that pull request head must match to allow merge
 
 
 ### Response if merge was successful
@@ -203,6 +204,14 @@ Name | Type | Description
   :documentation_url => "https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button"
 %>
 
+### Response if sha was provided and pull request head did not match
+
+<%= headers 409 %>
+<%= json \
+  :message => "Head branch was modified. Review and try the merge again.",
+  :documentation_url => "https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button"
+%>
+
 ### Labels, assignees, and milestones
 
 Every pull request is an issue, but not every issue is a pull request. For this reason, "shared" actions for both features, like manipulating assignees, labels and milestones, are provided within [the Issues API](/v3/issues).
