search

microsoft / vscode

Visual Studio Code
https://code.visualstudio.com
MIT License
162.67k stars 28.68k forks source link

Can we add more compare options for diff3 merge conflictstyle #188304

Open ZNackasha opened 1 year ago

ZNackasha commented 1 year ago

Currently, when we have a conflict we have the option to compare changes. this will simply compare HEAD with the Incoming Change. Using diff3 as a conflict style you will also have the ability to see the base branch. we currently don't have a way to compare changes with the base branch. This can be very useful when you simply want to know what was changed between the base and the selected change.

my suggestion is to simply add two more options. "compare current changes with Base" and "compare incoming changes with Base"

here is a basic example

image

hediet commented 1 year ago

Did you try the 3 way merge editor?

ZNackasha commented 1 year ago

Did you try the 3 way merge editor?

3 way merge editor does not support diff3 conflictstyle very well

hediet commented 1 year ago

3 way merge editor does not support diff3 conflictstyle very well

How so? You can make it show the base as well!