Merge Conflict screen

[karan1803]

Type: Feature Request

The new updated mere conflicted screen is not looking ood can u please put a existing option with select option (the user will select either the latest or exist one) please it kind of look sucks....

VS Code version: Code 1.70.1 (6d9b74a, 2022-08-10T06:08:33.642Z)
OS version: Windows_NT x64 10.0.19044
Modes:

[gjsjohnmurray]

See the git.mergeEditor setting.

/duplicate

[vscodenpa]

Thanks for creating this issue! We figured it's covering the same as another one we already have. Thus, we closed this one as a duplicate. You can search for similar existing issues. See also our issue reporting guidelines.

Happy Coding!