Merge branches method

Joe · Joe · commit fe8bdb755a8e · 2020-07-28T12:41:31.000+01:00
diff --git a/src/main/java/org/kohsuke/github/GHBranch.java b/src/main/java/org/kohsuke/github/GHBranch.java
@@ -165,6 +165,31 @@ public void enableProtection(EnforcementLevel level, Collection<String> contexts
         }
     }
 
+    /**
+     * Merge branches.
+     *
+     * @param headBranch
+     *            the branch whose head is being merged
+     *
+     * @param commit_message
+     *            the commit message
+     *
+     * @return GHCommit the merge commit created
+     *
+     * @throws IOException
+     *             if merging fails
+     */
+    public GHCommit merge(GHBranch headBranch, String commit_message) throws IOException {
+        return root.createRequest()
+                .withUrlPath(owner.getApiTailUrl("merges"))
+                .method("POST")
+                .with("commit_message", commit_message)
+                .with("base", this.name)
+                .with("head", headBranch.getName())
+                .fetch(GHCommit.class)
+                .wrapUp(owner);
+    }
+
     String getApiRoute() {
         return owner.getApiTailUrl("/branches/" + name);
     }
diff --git a/src/test/java/org/kohsuke/github/GHBranchProtectionTest.java b/src/test/java/org/kohsuke/github/GHBranchProtectionTest.java
@@ -112,4 +112,35 @@ public void testGetProtection() throws Exception {
         assertTrue(protectionTest instanceof GHBranchProtection);
         assertTrue(repo.getBranch(BRANCH).isProtected());
     }
+
+    @Test
+    public void testMergeBranch() throws Exception {
+        String name = "testMergeBranch";
+        String branchName = "test/" + name;
+
+        GHRepository repository = gitHub.getOrganization("hub4j-test-org").getRepository("github-api");
+        GHRef masterRef = repository.getRef("heads/master");
+        repository.createRef("refs/heads/" + branchName, masterRef.getObject().getSha());
+
+        GHContentUpdateResponse response = repository.createContent()
+                .content(name)
+                .message(name)
+                .path(name)
+                .branch(branchName)
+                .commit();
+
+        Thread.sleep(1000);
+
+        repository.createContent()
+                .content(name + name)
+                .path(name)
+                .branch(branchName)
+                .message(name)
+                .sha(response.getContent().getSha())
+                .commit();
+
+        GHBranch masterBranch = repository.getBranch("master");
+        GHCommit mergeCommit = repository.getBranch(branchName).merge(masterBranch, "merging master into testBranch");
+        assertNotNull(mergeCommit);
+    }
 }
