From 2a26a591a8a4273972d57cf7880fdf03123a66a4 Mon Sep 17 00:00:00 2001
From: Keith Williams <keithwillcode@gmail.com>
Date: Fri, 9 Jan 2026 17:35:30 -0300
Subject: [PATCH] chore: ignore fork PRs in devin-conflict-resolver workflow
 (#26640)

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 .github/workflows/devin-conflict-resolver.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/devin-conflict-resolver.yml b/.github/workflows/devin-conflict-resolver.yml
index 30315d4c86..ad8ea569ff 100644
--- a/.github/workflows/devin-conflict-resolver.yml
+++ b/.github/workflows/devin-conflict-resolver.yml
@@ -86,12 +86,18 @@ jobs:
             
             function processPR(pr, mergeableStatus) {
               const isTargetPR = manualPrNumber && pr.number === manualPrNumber;
+              const isFork = pr.headRepository?.owner?.login !== owner;
               
               if (!isTargetPR && pr.isDraft) {
                 console.log(`PR #${pr.number} is a draft, skipping`);
                 return { skip: true };
               }
               
+              if (!isTargetPR && isFork) {
+                console.log(`PR #${pr.number} is from a fork, skipping`);
+                return { skip: true };
+              }
+              
               if (!isTargetPR) {
                 const hasDevinLabel = pr.labels.nodes.some(label => label.name === 'devin-conflict-resolution');
                 if (hasDevinLabel) {
@@ -101,19 +107,13 @@ jobs:
               }
               
               if (mergeableStatus === 'CONFLICTING' || (isTargetPR && mergeableStatus !== 'MERGEABLE')) {
-                const isFork = pr.headRepository?.owner?.login !== owner;
                 const headRepoOwner = pr.headRepository?.owner?.login || owner;
                 const headRepoName = pr.headRepository?.name || repo;
                 
-                if (!isTargetPR && isFork && !pr.maintainerCanModify) {
-                  console.log(`PR #${pr.number} is from a fork without maintainer push access, skipping`);
-                  return { skip: true };
-                }
-                
                 if (isTargetPR) {
                   console.log(`PR #${pr.number} manually targeted for conflict resolution${isFork ? ' (from fork)' : ''}`);
                 } else {
-                  console.log(`PR #${pr.number} has conflicts${isFork ? ' (from fork)' : ''}`);
+                  console.log(`PR #${pr.number} has conflicts`);
                 }
                 
                 return {