Change:
white-space: nowrap; } <del> .monaco-workbench .merge-editor .code-view>.title>SPAN.title { </del> <ins> .monaco-workbench .merge-editor .code-view > .header > span.title { </ins> flex-shrink: 0; } <del> .monaco-workbench .merge-editor .code-view>.title>SPAN.description { </del> <ins> .monaco-workbench .merge-editor .code-view > .header > span.description { flex-shrink: 0; </ins> display: flex; font-size: 12px; align-items: center; color: var(--vscode-descriptionForeground); } <del> .monaco-workbench .merge-editor .code-view>.title>SPAN.description .codicon { </del> <ins> .monaco-workbench .merge-editor .code-view > .header > span.description .codicon { </ins> font-size: 14px; color: var(--vscode-descriptionForeground); } <del> .monaco-workbench .merge-editor .code-view>.title>SPAN.detail { </del> <ins> .monaco-workbench .merge-editor .code-view > .header > span.detail { </ins> margin-left: auto; <del> flex-shrink: 0; </del> font-size: 12px; color: var(--vscode-descriptionForeground); } <ins> .monaco-workbench .merge-editor .code-view > .header > span.detail .codicon { font-size: 13px; } </ins> /* for input1|2 -> align details to the left  */ <del> .monaco-workbench .merge-editor .code-view.input>.title>SPAN.detail::before { </del> <ins> .monaco-workbench .merge-editor .code-view.input > .header > span.detail::before { </ins> content: '•'; opacity: .5; padding-right: 3px; } <del> .monaco-workbench .merge-editor .code-view.input>.title>SPAN.detail { </del> <ins> .monaco-workbench .merge-editor .code-view.input > .header > span.detail { </ins> margin-left: 0; } <del> .monaco-workbench .merge-editor .code-view.input>.title>SPAN.toolbar { </del> <ins> .monaco-workbench .merge-editor .code-view.input > .header > span.toolbar { flex-shrink: 0; </ins> margin-left: auto; } <del> .monaco-workbench .merge-editor .code-view>.title>SPAN.detail .codicon { font-size: 13px; } .monaco-workbench .merge-editor .code-view>.container { </del> <ins> .monaco-workbench .merge-editor .code-view > .container { </ins> display: flex; flex-direction: row; } <del> .monaco-workbench .merge-editor .code-view>.container>.gutter { </del> <ins> .monaco-workbench .merge-editor .code-view > .container > .gutter { </ins> width: 24px; position: relative; overflow: hidden;

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 ! !