VSCode merge conflict options not displaying September 15, 2023 by Tarik If you still struggle with this issue try to turn off Git: Merge Editor flag.
