Skip to content

Commit 7bd5d2e

Browse files
benibenjCopilot
andcommitted
Fix Agent Merge helper formatting
Apply the repository formatter's continuation indentation so Compile & Hygiene accepts the session helper. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 902d2e3 commit 7bd5d2e

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

src/vs/sessions/browser/sessionAgentMerge.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ export function getAgentMergeAwarePullRequestIcon(icon: ThemeIcon, agentMerge: I
8383
}
8484
const handlesBlockers = blockers
8585
? (!blockers.hasFailingChecks || agentMerge.actions.fixCI)
86-
&& (!blockers.hasMergeConflicts || agentMerge.actions.resolveConflicts)
87-
&& (!blockers.hasUnresolvedComments || agentMerge.actions.addressReviews)
86+
&& (!blockers.hasMergeConflicts || agentMerge.actions.resolveConflicts)
87+
&& (!blockers.hasUnresolvedComments || agentMerge.actions.addressReviews)
8888
: agentMerge.actions.fixCI && agentMerge.actions.resolveConflicts && agentMerge.actions.addressReviews;
8989
return handlesBlockers ? openPullRequestIcon : icon;
9090
}

0 commit comments

Comments
 (0)