Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Setting for Merge Editor "Show Base Top"/"Show Base Center" in user/workspace settings.json #180710

Open
whut opened this issue Apr 24, 2023 · 0 comments
Assignees
Labels
feature-request Request for new features or functionality merge-editor
Milestone

Comments

@whut
Copy link

whut commented Apr 24, 2023

There is missing option to enable Merge Editor "Show Base Top"/"Show Base Center" in user/workspace settings.json. Without this option I was unable to find that VSCode Merge Editor is indeed a 3-way merge editor! Also this way I could keep it in version-controlled settings.json

Some background story about this adventure;): When I saw Merge Editor in VSCode I checked VSCode settings to check if there is a way to make it a proper 3-way merge editor and could not find it, so I started looking if someone already reported feature request for that. I found #154877 which was closed at the spot by @hediet (not nice;)), then #155251, and finally #155277, where issue was ultimately understood and implemented:). I still could not figure out how to enable it and finally I found comment by @HCanber that this option exists in three-dots menu. That was surprising as I used this menu to open the "Compare with base" option (which btw does not preserve focused line so it is useless) and it was not there. But in the end I found yet-another three-dots menu with what I wanted: showing base:) So there was one last thing to do, report this issue so no more people will struggle:)

@hediet hediet added feature-request Request for new features or functionality merge-editor labels Apr 26, 2023
@hediet hediet added this to the Backlog milestone Apr 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature-request Request for new features or functionality merge-editor
Projects
None yet
Development

No branches or pull requests

2 participants