jb/paseo
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Allow PR merge when GitHub reports it ready (#1172)

Browse Source
This commit is contained in:
Mohamed Boudra
2026-05-25 10:05:35 +00:00
committed by GitHub
parent 8a2e5c786e
commit 1e68283565
2 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/app/src/git/policy.ts
+9 -7
View File
@@ -504,7 +504,7 @@ function canMergeFromBase(input: BuildGitActionsInput): boolean {
function canMergePr(input: BuildGitActionsInput): boolean {
const github = input.pullRequestGithub;
const canMergeFromTopLevelStatus =
const canMergeFromPullRequestStatus =
input.githubFeaturesEnabled &&
input.hasPullRequest &&
input.pullRequestState === "open" &&
@@ -512,17 +512,19 @@ function canMergePr(input: BuildGitActionsInput): boolean {
!input.pullRequestIsMerged &&
input.pullRequestMergeable !== "CONFLICTING" &&
input.aheadCount > 0 &&
!input.hasUncommittedChanges &&
input.behindOfOrigin === 0 &&
input.aheadOfOrigin === 0 &&
!canMergeFromBase(input);
!input.hasUncommittedChanges;
if (!canMergeFromTopLevelStatus) {
if (!canMergeFromPullRequestStatus) {
return false;
}
if (!hasPullRequestGithubFacts(github)) {
return input.pullRequestMergeable === "MERGEABLE";
return (
input.pullRequestMergeable === "MERGEABLE" &&
input.behindOfOrigin === 0 &&
input.aheadOfOrigin === 0 &&
!canMergeFromBase(input)
);
}
return (