You are Fixing your Merge Conflicts The Wrong Way in VSCode 

where should I click? it wasn't clear to me

To be frank i was confused with this new editor but now I'm confident with this.

2:01 - I don't have this kind of view in my Source Control pane. What extension are you using for that?

Does anyone else have issue where the editor gets stuck on loading and mever loads the changes?

So when VSC introduced new merge look, a lot of ppls were confused and wanted old look back. So VSC was forced to back old way and set a new look as “feature”. I think that says a lot how new look is “awsome”

When vs code dev first launch this feature i was very confused. At first there some checkboxes thing but i think they have replaced it with proper buttons now which looks more user friendly to me now.

Thanks! Completely looked over the bright blue button in that bottom right lol. This is a much better way

the most important part and you hide it by the camera then process to do nothing

but this is NOT 3-way merge? in a 3-way merge there are 4 windows: base, local, remote, result. Here I am seeing only 3 windows. No base version (common ancestor). So how is this 3-way merge? this is just a diff with a separate result window.

You're a life saver! Thank you! I was so lost in the old way of doing it!

What's that theme you are using?

Button doesn't work for me I click and nothing happens.

Very good tutorial, just one question, where did you get this Source Control? It isn't default in vsc. It is GitLens. Thank you anyway.

Thanks for this video, It's clear to me now

I really like this new feature ❤

anyone knows how can we change the layout, i simply want the left side for current changes and the right side for incoming changes, will highly appreciate any solutions. Thanks

web dev simplified twin

this guy is a troll, he hid the most important part lol

Not sure how you confirmed your selection

How do you handle those staged changes which got added to the feature while merging?

thanks for the video, very clear

Lazy author, doesnt show button even after understood this is covered by the camera.

name of extension?

What extension is this at the beggining?

Thanks so much!

Thanks

neat! thanks

What happened at 1:37?

hi can you make a project how to use an alredy provided a design system

thx

Cool...but not beginners friendly.

vscode is super diffficult to use

if your camera is covering UI your are trying to demostrate - move your camera 👎

off thise camera man, do the tech content, not instagramm

too much bullshit

It seems like YOU are fixing your merge conflicts the wrong way. . I thought you were gonna talk about the ort strategy v.s. the recursive, and the -X ours flag, but i don't you even know about them. But hey, let's make a title "YOU are doing it wrong, i'm doing it right".

turning off video as soon as the "like a pro" was mentioned, lol i was not a pro but as soon as i see your video i'll be a pro?

Hello I just a small doubt on setting the state after fetching the data it will just take like a minute or so would someone like to help me out it will be quick I won't take much of your time can we connect on discord or something

Thanks