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 { { "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 /// The pull request number /// A instance describing a pull request merge /// An result which indicates the merge result - public Task Merge(string owner, string name, int number, MergePullRequest mergePullRequest) + public async Task 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(ApiUrls.MergePullRequest(owner, name, number), mergePullRequest); + return await ApiConnection.Put(ApiUrls.MergePullRequest(owner, name, number), mergePullRequest); } catch (ApiException ex) {