mergeEditor.conflict.handledUnfocused.border
merge editor conflict handled unfocused border. The border color of handled unfocused conflicts.
Group: Merge conflicts colors
Where merge editor conflict handled unfocused border paints
This sample moves from #3c3c3c to #e8a317, then back.
How to change merge editor conflict handled unfocused border color in Visual Studio Code
macOS
- Open settings.json. Press Shift+Command+P to open the Command Palette, then run Preferences: Open User Settings (JSON).
- Set this color id. Add merge editor conflict handled unfocused border under workbench.colorCustomizations. The border color of handled unfocused conflicts. Use a hex color such as #e8a317.
- 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.
- Open settings.json. Press Shift+Ctrl+P to open the Command Palette, then run Preferences: Open User Settings (JSON).
- Set this color id. Add merge editor conflict handled unfocused border under workbench.colorCustomizations. The border color of handled unfocused conflicts. Use a hex color such as #e8a317.
- 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.handledUnfocused.border": "#e8a317"
}
}Other Merge conflicts colors
- merge.currentHeaderBackground
Current header background in inline merge conflicts. The color must not be opaque so as not to hide underlying decorations.
- merge.currentContentBackground
Current content background in inline merge conflicts. The color must not be opaque so as not to hide underlying decorations.
- merge.incomingHeaderBackground
Incoming header background in inline merge conflicts. The color must not be opaque so as not to hide underlying decorations.
- merge.incomingContentBackground
Incoming content background in inline merge conflicts. The color must not be opaque so as not to hide underlying decorations.
- merge.border
Border color on headers and the splitter in inline merge conflicts.
- merge.commonContentBackground
Common ancestor content background in inline merge-conflicts. The color must not be opaque so as not to hide underlying decorations.
- merge.commonHeaderBackground
Common ancestor header background in inline merge-conflicts. The color must not be opaque so as not to hide underlying decorations.
- editorOverviewRuler.currentContentForeground
Current overview ruler foreground for inline merge conflicts.
- editorOverviewRuler.incomingContentForeground
Incoming overview ruler foreground for inline merge conflicts.
- editorOverviewRuler.commonContentForeground
Common ancestor overview ruler foreground for inline merge conflicts.
- editorOverviewRuler.commentForeground
Editor overview ruler decoration color for resolved comments. This color should be opaque.
- editorOverviewRuler.commentUnresolvedForeground
Editor overview ruler decoration color for unresolved comments. This color should be opaque.
- mergeEditor.change.background
The background color for changes.
- mergeEditor.change.word.background
The background color for word changes.
- mergeEditor.conflict.unhandledUnfocused.border
The border color of unhandled unfocused conflicts.
- mergeEditor.conflict.unhandledFocused.border
The border color of unhandled focused conflicts.
- mergeEditor.conflict.handledFocused.border
The border color of handled focused conflicts.
- mergeEditor.conflict.handled.minimapOverViewRuler
The foreground color for changes in input 1.
- mergeEditor.conflict.unhandled.minimapOverViewRuler
The foreground color for changes in input 1.
- mergeEditor.conflictingLines.background
The background of the "Conflicting Lines" text.
- mergeEditor.changeBase.background
The background color for changes in base.
- mergeEditor.changeBase.word.background
The background color for word changes in base.
- mergeEditor.conflict.input1.background
The background color of decorations in input 1.
- mergeEditor.conflict.input2.background
The background color of decorations in input 2.