mamh-java
diff --git a/‎src/main/java/org/kohsuke/github/GHPullRequest.java‎
Lines changed: 7 additions & 6 deletions b/‎src/main/java/org/kohsuke/github/GHPullRequest.java‎
Lines changed: 7 additions & 6 deletions
diff --git a/‎src/main/java/org/kohsuke/github/extras/OkHttpConnector.java‎
Lines changed: 1 addition & 0 deletions b/‎src/main/java/org/kohsuke/github/extras/OkHttpConnector.java‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/test/java/org/kohsuke/github/PullRequestTest.java‎
Lines changed: 1 addition & 1 deletion b/‎src/test/java/org/kohsuke/github/PullRequestTest.java‎
Lines changed: 1 addition & 1 deletion
@@ -277,7 +277,7 @@ public GHPullRequestReviewComment createReviewComment(String body, String sha, S
      *      Commit message. If null, the default one will be used.
      */
     public void merge(String msg) throws IOException {
-        merge(msg,(String)null);
+        merge(msg,null);
     }
 
     /**
@@ -291,7 +291,7 @@ public void merge(String msg) throws IOException {
      *      SHA that pull request head must match to allow merge.
      */
     public void merge(String msg, String sha) throws IOException {
-        new Requester(root).method("PUT").with("commit_message",msg).with("sha",sha).to(getApiRoute()+"/merge");
+        merge(msg, sha, null);
     }
 
     /**
@@ -304,11 +304,12 @@ public void merge(String msg, String sha) throws IOException {
      * @param method
      *      SHA that pull request head must match to allow merge.
      */
-    public void merge(String msg, MergeMethod method) throws IOException {
+    public void merge(String msg, String sha, MergeMethod method) throws IOException {
         new Requester(root).method("PUT")
-		.with("commit_message",msg)
-		.with("merge_method",method)
-		.to(getApiRoute()+"/merge");
+                .with("commit_message",msg)
+                .with("sha",sha)
+                .with("merge_method",method)
+                .to(getApiRoute()+"/merge");
     }
 
     public enum MergeMethod{ MERGE, SQUASH, REBASE }
 
@@ -30,3 +30,4 @@ public HttpURLConnection connect(URL url) throws IOException {
         return urlFactory.open(url);
     }
 }
+GHPul
@@ -78,7 +78,7 @@ public void testSquashMerge() throws Exception {
         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();
     }
Original file line number	Diff line number	Diff line change
`@@ -30,3 +30,4 @@ public HttpURLConnection connect(URL url) throws IOException {`
`30`	`30`	`return urlFactory.open(url);`
`31`	`31`	`}`
`32`	`32`	`}`
	`33`	`+GHPul`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public void testSquashMerge() throws Exception {`
`78`	`78`	`Thread.sleep(1000);`
`79`	`79`	`GHPullRequest p = getRepository().createPullRequest(name, name, "master", "## test squash");`
`80`	`80`	`Thread.sleep(1000);`
`81`		`- p.merge("squash merge", GHPullRequest.MergeMethod.SQUASH);`
	`81`	`+ p.merge("squash merge", null, GHPullRequest.MergeMethod.SQUASH);`
`82`	`82`	`branchRef.delete();`
`83`	`83`	`}`
`84`	`84`