You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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:)
The text was updated successfully, but these errors were encountered:
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:)
The text was updated successfully, but these errors were encountered: