Commit4d47e0d

Hubot

committed

Sync changes from upstream repository

1 parentb88467e commit4d47e0dCopy full SHA for 4d47e0d

File tree

-0

lines changed

-0

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,7 @@ Note: The response includes a maximum of 250 commits. If you are working with a`
`184`	`184`	`Name \| Type \| Description`
`185`	`185`	`-----\|------\|-------------`
`186`	`186`	`commit_message`\|`string`\| The message that will be used for the merge commit
	`187`	+`sha`\|`string`\| SHA that pull request head must match to allow merge
`187`	`188`
`188`	`189`
`189`	`190`	`###Response if merge was successful`
`@@ -203,6 +204,14 @@ Name \| Type \| Description`
`203`	`204`	`:documentation_url => "https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button"`
`204`	`205`	`%>`
`205`	`206`
	`207`	`+###Response if sha was provided and pull request head did not match`
	`208`	`+`
	`209`	`+<%= headers 409 %>`
	`210`	`+<%= json\`
	`211`	`+:message => "Head branch was modified. Review and try the merge again.",`
	`212`	`+:documentation_url => "https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button"`
	`213`	`+%>`
	`214`	`+`
`206`	`215`	`###Labels, assignees, and milestones`
`207`	`216`
`208`	`217`	`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).`

Comments

(0)