Change:
Theirs / Yours title area is currently quite empty. We should consider to add an action bar for "Compare with Base" action. The title area should also have additional Git information in the future fyi !
I don't see a branch or commit id in your screenshot. Is that configured somehow? <img width="533" alt="CleanShot 2022-06-28 at 10 00 52 src="https://user-"In any case, we could introduce a toolbar somewhat like the editor. Icons are placeholder, but an example could look like: <img width="1032" alt="CleanShot 2022-06-28 at 10 05 06 src="https://user-"
Unsure what was seeing there but with the normal git flow we do show the branch names and commits in question. There is also different issue for the toolbar and since today an icon in front of the commit it
To verify open a merge editor verify that it has menus with yours/theirs

Discussion:
static readonly InlineCompletionsActions = new MenuId('InlineCompletionsActions'); static readonly NewFile = new MenuId('NewFile'); static readonly MergeToolbar = new MenuId('MergeToolbar'); <ins> static readonly MergeInput1Toolbar = new MenuId('MergeToolbar1Toolbar'); static readonly MergeInput2Toolbar = new MenuId('MergeToolbar2Toolbar'); </ins> /** * Create or reuse a `MenuId` with the given identifier

), original: 'Compare Input 1 With Base', }, <ins> shortTitle: localize('mergeEditor.compareWithBase', 'Compare With Base'), </ins> f1: true, precondition: ctxIsMergeEditor, <ins> menu: { id: MenuId.MergeInput1Toolbar } </ins> }); } run(accessor: ServicesAccessor, ...args: unknown[]): void {

), original: 'Compare Input 2 With Base', }, <ins> shortTitle: localize('mergeEditor.compareWithBase', 'Compare With Base'), </ins> f1: true, precondition: ctxIsMergeEditor, <ins> menu: { id: MenuId.MergeInput2Toolbar } </ins> }); } run(accessor: ServicesAccessor, ...args: unknown[]): void {

h('span.title@title'), h('span.description@description'), h('span.detail@detail'), <ins> h('span.toolbar@toolbar'), </ins> ]), h('div.container', [ h('div.gutter@gutterDiv'),

import * as dom from 'vs/base/browser/dom'; import { Toggle } from 'vs/base/browser/ui/toggle/toggle'; <ins> import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar'; </ins> import { Action, IAction, Separator } from 'vs/base/common/actions'; import { Codicon } from 'vs/base/common/codicons'; import { Disposable } from 'vs/base/common/lifecycle';

import { IModelDeltaDecoration, MinimapPosition, OverviewRulerLane } from 'vs/editor/common/model'; import { CodeLensContribution } from 'vs/editor/contrib/codelens/browser/codelensController'; import { localize } from 'vs/nls'; <ins> import { createAndFillInActionBarActions } from 'vs/platform/actions/browser/menuEntryActionViewItem'; import { IMenuService, MenuId } from 'vs/platform/actions/common/actions'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; </ins> import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { attachToggleStyler } from 'vs/platform/theme/common/styler';

constructor( public readonly inputNumber: 1 | 2, <ins> titleMenuId: MenuId, </ins> @IInstantiationService instantiationService: IInstantiationService, @IContextMenuService contextMenuService: IContextMenuService, @IThemeService themeService: IThemeService, <ins> @IMenuService menuService: IMenuService, @IContextKeyService contextKeyService: IContextKeyService, </ins> ) { super(instantiationService);

createView: (item, target) => new MergeConflictGutterItemView(item, target, contextMenuService, themeService), }) ); <ins> // title menu const titleMenu = menuService.createMenu(titleMenuId, contextKeyService); const toolBar = new ToolBar(this.htmlElements.toolbar, contextMenuService); const toolBarUpdate = () => { const secondary: IAction[] = []; createAndFillInActionBarActions(titleMenu, { renderShortTitle: true }, secondary); toolBar.setActions([], secondary); }; this._store.add(toolBar); this._store.add(titleMenu); this._store.add(titleMenu.onDidChange(toolBarUpdate)); toolBarUpdate(); </ins> } protected override getEditorContributions(): IEditorContributionDescription[] | undefined {

private readonly _sessionDisposables = new DisposableStore(); private _grid!: Grid<IView>; <del> private readonly input1View = this._register(this.instantiationService.createInstance(InputCodeEditorView, 1)); private readonly input2View = this._register(this.instantiationService.createInstance(InputCodeEditorView, 2)); </del> <ins> private readonly input1View = this._register(this.instantiationService.createInstance(InputCodeEditorView, 1, MenuId.MergeInput1Toolbar)); private readonly input2View = this._register(this.instantiationService.createInstance(InputCodeEditorView, 2, MenuId.MergeInput2Toolbar)); </ins> private readonly inputResultView = this._register(this.instantiationService.createInstance(ResultCodeEditorView)); private readonly _layoutMode: MergeEditorLayout;