jlengrand/github-api
1
0
Fork 0
mirror of https://github.com/jlengrand/github-api.git synced 2026-04-03 15:50:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Massage the signature a bit.

Browse Source 
AFAICT sha and merge_method are not mutually exclusive.
This commit is contained in:
Kohsuke Kawaguchi
2017-09-09 12:17:21 -07:00
parent fe2af19e42
commit 9012820c03
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/java/org/kohsuke/github/PullRequestTest.java
View File

@@ -78,7 +78,7 @@ public class PullRequestTest extends AbstractGitHubApiTestBase {
Thread.sleep(1000);
GHPullRequest p = getRepository().createPullRequest(name, name, "master", "## test squash");
Thread.sleep(1000);
p.merge("squash merge", GHPullRequest.MergeMethod.SQUASH);
p.merge("squash merge", null, GHPullRequest.MergeMethod.SQUASH);
branchRef.delete();
}