Skip to content

Log GitHub merge rejections #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timkpaine merged 1 commit into from
Aug 11, 2026
Merged

Log GitHub merge rejections #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/github.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,10 @@ export class GitHubClient {
);
return result.merged;
} catch (error) {
if (error instanceof GitHubError && (error.status === 405 || error.status === 409)) return false;
if (error instanceof GitHubError && (error.status === 405 || error.status === 409)) {
console.error(error.message);
return false;
}
throw error;
}
}
Expand Down
5 changes: 5 additions & 0 deletions tests/github.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { afterEach, describe, expect, test, vi } from "vitest";
import { GitHubClient } from "../src/github";

afterEach(() => {
vi.restoreAllMocks();
vi.unstubAllGlobals();
});

Expand Down Expand Up @@ -39,10 +40,14 @@ describe("GitHub client", () => {
});

test("returns false when GitHub blocks a merge", async () => {
const errorMock = vi.spyOn(console, "error").mockImplementation(() => undefined);
vi.stubGlobal("fetch", vi.fn().mockResolvedValue(Response.json({ message: "Merge blocked" }, { status: 405 })));
const client = new GitHubClient("token", "owner/repository");

expect(await client.merge(12, "abc123", "squash")).toBe(false);
expect(errorMock).toHaveBeenCalledWith(
"PUT /repos/owner/repository/pulls/12/merge: GitHub returned 405: Merge blocked",
);
});

test("pins a successful merge to the checked head commit", async () => {
Expand Down