VSCode merge conflict don't show code conflict but other git gui tools show?

Question

There is a conflict when I merge a branch: git merge main.

I want to use main branch changes directly.

when I use VSCode resolve conflict (main branch is on the left, my branch is on the right):

I click "Accept All changes from left" button:

Line 16 of result is my branch!

But I use other git GUI(IDEA, sublime merge, etc) show (main branch is on right, my branch is on left):

I click "taker right" button:

Line 16 of result is main branch!

Why?

VSCode Version:

Both of these tools seem to indicate the same thing... am I missing something? — Timothy G., Nov 21 '22 at 18:43
It's still not clear what you mean. Both of these tools are showing the same thing, except they are visually different. These are basically 3 way file comparisons being shown. — Timothy G., Nov 22 '22 at 02:25

score 0 · Answer 1 · answered Nov 22 '22 at 02:41

0

do you using a same merge.conflictstyle? if u do so, the result must be the same,

u can try this,

git config --global merge.conflictstyle diff3

and do it again in ur command line

git merge xxx

answered Nov 22 '22 at 02:41

Peter

1 Answers1