Skip to main content
Coding Theme

mergeEditor.conflict.unhandledFocused.border

merge editor conflict unhandled focused border. The border color of unhandled focused conflicts.

Group: Merge conflicts colors

Where merge editor conflict unhandled focused border paints

This sample moves from #3c3c3c to #e8a317, then back.

merge editor conflict unhandled focused border
+ added line- removed line

How to change merge editor conflict unhandled focused border color in Visual Studio Code

macOS

  1. Open settings.json. Press Shift+Command+P to open the Command Palette, then run Preferences: Open User Settings (JSON).
  2. Set this color id. Add merge editor conflict unhandled focused border under workbench.colorCustomizations. The border color of unhandled focused conflicts. Use a hex color such as #e8a317.
  3. Save the file. Press Command+S to save settings.json. Visual Studio Code applies the override on top of the active color theme. Remove the entry to use the theme color again.

Windows

Linux uses the same shortcuts.

  1. Open settings.json. Press Shift+Ctrl+P to open the Command Palette, then run Preferences: Open User Settings (JSON).
  2. Set this color id. Add merge editor conflict unhandled focused border under workbench.colorCustomizations. The border color of unhandled focused conflicts. Use a hex color such as #e8a317.
  3. Save the file. Press Ctrl+S to save settings.json. Visual Studio Code applies the override on top of the active color theme. Remove the entry to use the theme color again.
{
  "workbench.colorCustomizations": {
    "mergeEditor.conflict.unhandledFocused.border": "#e8a317"
  }
}

Other Merge conflicts colors