merge.incomingContentBackground
merge incoming content background. Incoming content background in inline merge conflicts. The color must not be opaque so as not to hide underlying decorations.
Group: Merge conflicts colors
Where merge incoming content background paints
This sample moves from #252526 to #1a5276, then back.
How to change merge incoming content background 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 incoming content background under workbench.colorCustomizations. Incoming content background in inline merge conflicts. The color must not be opaque so as not to hide underlying decorations. Use a hex color such as #1a5276.
- 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 incoming content background under workbench.colorCustomizations. Incoming content background in inline merge conflicts. The color must not be opaque so as not to hide underlying decorations. Use a hex color such as #1a5276.
- 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": {
"merge.incomingContentBackground": "#1a5276"
}
}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.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.handledUnfocused.border
The border color of handled unfocused 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.