1 year ago

#330494

test-img

lte__

VS Code on Mac doesn't have merge conflict acceptance tools?

According to the documentation, VS Code should have a merge conflict review that allows you to accept the merges:

enter image description here

However, I can't seem to access this functionality. If I open the file with the merge conflict, I only get a split view, which is nice, but I don't get any way to accept or reject changes and fix merge conflicts:

enter image description here

This is all I can see. How can I activate the view where I can accept or reject changes?

visual-studio-code

merge-conflict-resolution

0 Answers

Your Answer

Accepted video resources