Merge pull request #400 from iFixit/move-merge-conflict-pulls-out-of-…

…qa-column Pulldasher: Update QA Column Filtering
iFixit · Dec 26, 2023 · a280d67 · a280d67
2 parents 692e0f3 + 585a488
commit a280d67
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/frontend/src/pulldasher/index.tsx b/frontend/src/pulldasher/index.tsx
@@ -48,6 +48,7 @@ function Pulldasher() {
       !pull.isQaDone() &&
       !pull.getDevBlock() &&
       !pull.isDraft() &&
+      !pull.hasMergeConflicts() &&
       pull.hasPassedCI()
   );
   const leadersCR = getLeaders(allPulls, (pull) => pull.status.allCR);