Change:
flex-grow: 0; } <del> .merge-editor-diff { </del> <ins> .monaco-workbench .merge-editor .merge-editor-diff { </ins> background-color: var(--vscode-mergeEditor-change-background); } <del> .merge-editor-diff-word { </del> <ins> .monaco-workbench .merge-editor .merge-editor-diff-word { </ins> background-color: var(--vscode-mergeEditor-change-word-background); } /* BEGIN: .merge-editor-block */ <del> .merge-editor-block:not(.handled) { </del> <ins> .monaco-workbench .merge-editor .merge-editor-block:not(.handled) { </ins> background-color: var(--vscode-mergeEditor-conflict-unhandledUnfocused-background); } <del> .merge-editor-block:not(.handled):not(.focused) { </del> <ins> .monaco-workbench .merge-editor .merge-editor-block:not(.handled):not(.focused) { </ins> border: 1px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border); } <del> .merge-editor-block:not(.handled).focused { </del> <ins> .monaco-workbench .merge-editor .merge-editor-block:not(.handled).focused { </ins> border: 2px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border); } <del> .merge-editor-block.handled:not(.focused) { </del> <ins> .monaco-workbench .merge-editor .merge-editor-block.handled:not(.focused) { </ins> border: 1px solid var(--vscode-mergeEditor-conflict-handledUnfocused-border); } <del> .merge-editor-block.handled:not(.focused).conflicting { </del> <ins> .monaco-workbench .merge-editor .merge-editor-block.handled:not(.focused).conflicting { </ins> background-color: var(--vscode-mergeEditor-conflict-handledUnfocused-background); } <del> .merge-editor-block.handled.focused { </del> <ins> .monaco-workbench .merge-editor .merge-editor-block.handled.focused { </ins> border: 1px solid var(--vscode-mergeEditor-conflict-handledFocused-border); } <del> .merge-editor-block.handled.focused.conflicting { </del> <ins> .monaco-workbench .merge-editor .merge-editor-block.handled.focused.conflicting { </ins> background-color: var(--vscode-mergeEditor-conflict-handledFocused-background); } <del> .merge-editor-simplified.input.i1, .merge-editor-block.use-simplified-decorations.input.i1 { </del> <ins> .monaco-workbench .merge-editor .merge-editor-simplified.input.i1, .merge-editor-block.use-simplified-decorations.input.i1 { </ins> background-color: var(--vscode-mergeEditor-conflict-input1-background); } <del> .merge-editor-simplified.input.i2, .merge-editor-block.use-simplified-decorations.input.i2 { </del> <ins> .monaco-workbench .merge-editor .merge-editor-simplified.input.i2, .merge-editor-block.use-simplified-decorations.input.i2 { </ins> background-color: var(--vscode-mergeEditor-conflict-input2-background); } /* END: .merge-editor-block */ <del> .gutter.monaco-editor>div { </del> <ins> .gutter.monaco-editor > div { </ins> position: absolute; }

Discussion:
<!-- Do Not Delete This! bugreporttemplate --<!-- Please read our Rules of Conduct: --<!-- Read our guide about submitting issues: --<!-- Search existing issues to avoid creating duplicates. --<!-- Test using the latest Insiders build to see if your issue has already been fixed: --<!-- Instead of creating your report here, use 'Report Issue' from the 'Help' menu in VS Code to pre-fill useful information. --<!-- Launch with to check. --Does this issue occur when all extensions are disabled?: Yes <!-- If you answered No above, use 'Help: Start Extension Bisect' from Command Palette to try to identify the cause. --<!-- Issues caused by an extension need to be reported directly to the extension publisher. The 'Help Report Issue' dialog can assist with this. --- VS Code Version: 1.72.2 OS Version: macOS Montery 12.6 Steps to Reproduce: merge editor while rebasing on a branch with a lot of branch pointers or ones with a long name The text from the "Current" column overlaps into the "Incoming" column. Confirmed that it happens with the default theme as well. !
Please try out the latest insiders, this should be fixed.
Still appears to be an issue in the latest insiders ! !