just go to settings: and click on the checkbox 'Git: Merge editor'. When you open a file from the source control panel, it will open the 3-way merge. I have no idea what this clown in the video is doing.
Thats from the GitLens extension (eamodio.gitlens). They moved the "Search & Compare" section into the dedicated "GitLens Inspect" tab on Version 14.0.0.
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”
To me the OG look is the king. I mean, I can simply see the changes under each other. No two scrolling panes, just simplicity... There is something great about having it like default conflict, but with just highlighting...
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.
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.
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
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".
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
@@whoman7930 I am unable to ping you on discord it says only direct messages from friends are accepted will wait for your reply on discord sent you a friend request
To be frank i was confused with this new editor but now I'm confident with this.
I landed my first job on the team a month ago with react js tutorials. now this is useful because I messed up merge conflict last week
where should I click? it wasn't clear to me
just go to settings: and click on the checkbox 'Git: Merge editor'. When you open a file from the source control panel, it will open the 3-way merge. I have no idea what this clown in the video is doing.
2:01 - I don't have this kind of view in my Source Control pane. What extension are you using for that?
I'm looking for anwser too
Any word yet?
Thats from the GitLens extension (eamodio.gitlens). They moved the "Search & Compare" section into the dedicated "GitLens Inspect" tab on Version 14.0.0.
samee
GitLens Extension
is what you are looking for ;)
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”
Totally agree. I disliked so much and glad they reverted.
To me the OG look is the king. I mean, I can simply see the changes under each other. No two scrolling panes, just simplicity...
There is something great about having it like default conflict, but with just highlighting...
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.
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.
What tool support 3-way merge?
@@kocho4242 meld
Does anyone else have issue where the editor gets stuck on loading and mever loads the changes?
Thanks! Completely looked over the bright blue button in that bottom right lol. This is a much better way
Button doesn't work for me I click and nothing happens.
What happened at 1:37?
I don't know too😢
You're a life saver! Thank you! I was so lost in the old way of doing it!
the most important part and you hide it by the camera then process to do nothing
What's that theme you are using?
yes please
web dev simplified twin
Totally 😂
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
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
How do you handle those staged changes which got added to the feature while merging?
I really like this new feature ❤
the comments were more useful than the video, i was just looking for that button he has been blocking with his face
What extension is this at the beggining?
this guy is a troll, he hid the most important part lol
Not sure how you confirmed your selection
name of extension?
you literally had one job. Clearly Nailed it.
Lazy author, doesnt show button even after understood this is covered by the camera.
thanks for the video, very clear
hi can you make a project how to use an alredy provided a design system
Thanks so much!
neat! thanks
Cool...but not beginners friendly.
if your camera is covering UI your are trying to demostrate - move your camera 👎
vscode is super diffficult to use
Thanks
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".
off thise camera man, do the tech content, not instagramm
thx
too much bullshit
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
Sure, leave a message at, CuriosBasant#7850
@@whoman7930 I am unable to ping you on discord it says only direct messages from friends are accepted will wait for your reply on discord sent you a friend request
Thanks