Codex: Fix update conflict#296445

dmitrivMS wants to merge 1 commit into

mainmicrosoft/vscode:mainfrom

dev/dmitriv/setup-conflict-codexmicrosoft/vscode:dev/dmitriv/setup-conflict-codexCopy head branch name to clipboard