From 74cb2b2b90a7aed2f518bdefa13185d422ba8d9a Mon Sep 17 00:00:00 2001
From: Gabriel Weyer <gabrielweyer@gmail.com>
Date: Mon, 14 Dec 2015 22:37:12 +1100
Subject: [PATCH] Awaiting result of pull request merge so that we can catch
 the exception, fixed integration test by making pull request un mergeable

---
 Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs | 3 ++-
 Octokit/Clients/PullRequestsClient.cs                        | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
index 8c271f0d..f186e38e 100644
--- a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
@@ -246,7 +246,8 @@ public class PullRequestsClientTests : IDisposable
 
         var master = await _github.GitDatabase.Reference.Get(Helper.UserName, _context.RepositoryName, "heads/master");
         var newMasterTree = await CreateTree(new Dictionary<string, string> { { "README.md", "Hello World, we meet again!" } });
-        await CreateCommit("baseline for pull request", newMasterTree.Sha, master.Object.Sha);
+        var masterCommit = await CreateCommit("Commit in master", newMasterTree.Sha, master.Object.Sha);
+        await _github.GitDatabase.Reference.Update(Helper.UserName, _context.RepositoryName, "heads/master", new ReferenceUpdate(masterCommit.Sha));
 
         var newPullRequest = new NewPullRequest("a pull request", branchName, "master");
         var pullRequest = await _fixture.Create(Helper.UserName, _context.RepositoryName, newPullRequest);
diff --git a/Octokit/Clients/PullRequestsClient.cs b/Octokit/Clients/PullRequestsClient.cs
index 20f5d6f8..85ffe16f 100644
--- a/Octokit/Clients/PullRequestsClient.cs
+++ b/Octokit/Clients/PullRequestsClient.cs
@@ -110,7 +110,7 @@ namespace Octokit
         /// <param name="number">The pull request number</param>
         /// <param name="mergePullRequest">A <see cref="MergePullRequest"/> instance describing a pull request merge</param>
         /// <returns>An <see cref="PullRequestMerge"/> result which indicates the merge result</returns>
-        public Task<PullRequestMerge> Merge(string owner, string name, int number, MergePullRequest mergePullRequest)
+        public async Task<PullRequestMerge> Merge(string owner, string name, int number, MergePullRequest mergePullRequest)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
             Ensure.ArgumentNotNullOrEmptyString(name, "name");
@@ -118,7 +118,7 @@ namespace Octokit
 
             try
             {
-                return ApiConnection.Put<PullRequestMerge>(ApiUrls.MergePullRequest(owner, name, number), mergePullRequest);
+                return await ApiConnection.Put<PullRequestMerge>(ApiUrls.MergePullRequest(owner, name, number), mergePullRequest);
             }
             catch (ApiException ex)
             {