Skip to content

fix: use 'mergeable' field for PR conflict detection #143

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
bborn merged 1 commit into from
Jan 12, 2026
Merged

fix: use 'mergeable' field for PR conflict detection #143

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
16 changes: 8 additions & 8 deletions internal/github/pr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ type ghPRResponse struct {
State string `json:"state"`
IsDraft bool `json:"isDraft"`
Title string `json:"title"`
MergeStateStatus string `json:"mergeStateStatus"`
Mergeable string `json:"mergeable"`
StatusCheckRollup []ghCheck `json:"statusCheckRollup"`
UpdatedAt string `json:"updatedAt"`
}
Expand Down Expand Up @@ -133,9 +133,9 @@ func fetchPRInfo(repoDir, branchName string) *PRInfo {
defer cancel()

// Query for PR associated with this branch
// gh pr view <branch> --json number,url,state,isDraft,title,mergeStateStatus,statusCheckRollup,updatedAt
// gh pr view <branch> --json number,url,state,isDraft,title,mergeable,statusCheckRollup,updatedAt
cmd := exec.CommandContext(ctx, "gh", "pr", "view", branchName,
"--json", "number,url,state,isDraft,title,mergeStateStatus,statusCheckRollup,updatedAt")
"--json", "number,url,state,isDraft,title,mergeable,statusCheckRollup,updatedAt")
cmd.Dir = repoDir

output, err := cmd.Output()
Expand All @@ -155,7 +155,7 @@ func fetchPRInfo(repoDir, branchName string) *PRInfo {
URL: resp.URL,
Title: resp.Title,
IsDraft: resp.IsDraft,
Mergeable: resp.MergeStateStatus,
Mergeable: resp.Mergeable,
}

// Parse state
Expand Down Expand Up @@ -295,7 +295,7 @@ type ghPRListResponse struct {
IsDraft bool `json:"isDraft"`
Title string `json:"title"`
HeadRefName string `json:"headRefName"`
MergeStateStatus string `json:"mergeStateStatus"`
Mergeable string `json:"mergeable"`
StatusCheckRollup []ghCheck `json:"statusCheckRollup"`
UpdatedAt string `json:"updatedAt"`
}
Expand All @@ -316,7 +316,7 @@ func FetchAllPRsForRepo(repoDir string) map[string]*PRInfo {
// Get all open PRs in one call
cmd := exec.CommandContext(ctx, "gh", "pr", "list",
"--state", "open",
"--json", "number,url,state,isDraft,title,headRefName,mergeStateStatus,statusCheckRollup,updatedAt",
"--json", "number,url,state,isDraft,title,headRefName,mergeable,statusCheckRollup,updatedAt",
"--limit", "100")
cmd.Dir = repoDir

Expand All @@ -343,7 +343,7 @@ func FetchAllPRsForRepo(repoDir string) map[string]*PRInfo {

cmd2 := exec.CommandContext(ctx2, "gh", "pr", "list",
"--state", "merged",
"--json", "number,url,state,isDraft,title,headRefName,mergeStateStatus,updatedAt",
"--json", "number,url,state,isDraft,title,headRefName,mergeable,updatedAt",
"--limit", "20")
cmd2.Dir = repoDir

Expand Down Expand Up @@ -373,7 +373,7 @@ func parsePRListResponse(pr *ghPRListResponse) *PRInfo {
URL: pr.URL,
Title: pr.Title,
IsDraft: pr.IsDraft,
Mergeable: pr.MergeStateStatus,
Mergeable: pr.Mergeable,
}

// Parse state
Expand Down
Loading