Consider to change default layout for merge editor



We should consider changing the default layout of the Merge Editor to be vertical. Reasons:

  • Users might have the terminal open when getting into a conflict resulting in a complex layout.
  • Google has shipped the vertical merge editor layout as a default to their engineers and it was well-received.
  • Some of the existing tools use the vertical layout as the default

fyi @jrieken @daviddossett

2022-10-05 09:30:54

Add a Comment

Top 3 Comments

  hediet answered on 2022-10-05 10:54:45

I like the experiment idea!

0 positive reactions.
  jrieken answered on 2022-10-05 09:52:28

Might also be a good a/b experiment. Vary the modes and measure the time to resolve/abandon a conflict


2 positive reactions.
  jrieken answered on 2022-10-05 09:48:56

I like the direction but not the reasoning - I can easily construct the opposite, like "other tools use the mixed mode" or "user might have the explorer open" etc pp. We could investigate a smart mode that adopts to the available space or use harder facts like

  • most screens are wider than high
  • the column mode allows for a nicer alignment of incoming, result, and current
2 positive reactions.

Quick Hint

Is Vim better than Vscode?

Visual Studio Code has a broader approval, being mentioned in 1104 company stacks & 2298 developers stacks; compared to Vim, which is listed in 844 company stacks and 860 developer stacks.

Repo Information

Age 7yrs
Vendor microsoft
Repo Name vscode
Primary Language TypeScript
Default Branch main
Last Update 9 hours ago

Microsoft's Code Library

Similar Issues

πŸ’Ύ DirectXShaderCompiler Update Linux build and test workflows to use lit πŸ’¬ 3 open πŸ—“οΈ 16 hours ago
πŸ’Ύ DirectXShaderCompiler DXC API fails to report compilation error πŸ’¬ 3 closed πŸ—“οΈ 1 day ago
πŸ’Ύ DirectXShaderCompiler [NFC] Address some low hanging fruit UBSan failures πŸ’¬ 5 open πŸ—“οΈ 1 day ago
πŸ’Ύ vscode-as3mxml Add ability to set extra tokens in settings πŸ’¬ 7 open πŸ—“οΈ 2 days ago
πŸ’Ύ aws-toolkit-vscode Draft: Do Not Merge πŸ’¬ 16 closed πŸ—“οΈ 2 days ago
πŸ’Ύ AzureTRE Amend conda configuration in Nexus πŸ’¬ 3 open πŸ—“οΈ 2 days ago
πŸ’Ύ AzureTRE Firewall policies and Ip group πŸ’¬ 3 open πŸ—“οΈ 2 days ago