diff --git a/frontend/src/pulldasher/index.tsx b/frontend/src/pulldasher/index.tsx index 424399c4..58b2df62 100644 --- 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);