No video

You are Fixing your Merge Conflicts The Wrong Way in VSCode

  Рет қаралды 81,538

CoderOne

CoderOne

Күн бұрын

Пікірлер: 53
@cristianofelipe9907
@cristianofelipe9907 Жыл бұрын
where should I click? it wasn't clear to me
@densecop699
@densecop699 Жыл бұрын
To be frank i was confused with this new editor but now I'm confident with this.
@wiktor5399
@wiktor5399 Жыл бұрын
2:01 - I don't have this kind of view in my Source Control pane. What extension are you using for that?
@tiagoaleffdasilva8092
@tiagoaleffdasilva8092 10 ай бұрын
I'm looking for anwser too
@DHEspana
@DHEspana 10 ай бұрын
Any word yet?
@sascha2581
@sascha2581 9 ай бұрын
Thats from the GitLens extension (eamodio.gitlens). They moved the "Search & Compare" section into the dedicated "GitLens Inspect" tab on Version 14.0.0.
@Adormir123
@Adormir123 3 ай бұрын
samee
@CodeNoctisCZ
@CodeNoctisCZ 3 ай бұрын
GitLens Extension is what you are looking for ;)
@vanjalegac3969
@vanjalegac3969 Жыл бұрын
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”
@mariolucki212
@mariolucki212 Жыл бұрын
Totally agree. I disliked so much and glad they reverted.
@etaos833
@etaos833 Жыл бұрын
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...
@zizak143
@zizak143 8 күн бұрын
Does anyone else have issue where the editor gets stuck on loading and mever loads the changes?
@nulla9601
@nulla9601 4 ай бұрын
Thanks! Completely looked over the bright blue button in that bottom right lol. This is a much better way
@princeparaste5659
@princeparaste5659 Жыл бұрын
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.
@eugenefedorov3498
@eugenefedorov3498 5 ай бұрын
Lazy author, doesnt show button even after understood this is covered by the camera.
@neurochannels
@neurochannels Жыл бұрын
Button doesn't work for me I click and nothing happens.
@TeeKaaY
@TeeKaaY Жыл бұрын
What's that theme you are using?
@megasuperlexa2
@megasuperlexa2 Жыл бұрын
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.
@kocho4242
@kocho4242 Жыл бұрын
What tool support 3-way merge?
@snuffinperl8059
@snuffinperl8059 Ай бұрын
@@kocho4242 meld
@soulphish48
@soulphish48 Жыл бұрын
You're a life saver! Thank you! I was so lost in the old way of doing it!
@lucasalmeida5790
@lucasalmeida5790 Жыл бұрын
web dev simplified twin
@michalguy
@michalguy Жыл бұрын
Totally 😂
@bartoshleurc4892
@bartoshleurc4892 Жыл бұрын
I really like this new feature ❤
@paillote
@paillote 2 ай бұрын
Not sure how you confirmed your selection
@blessingejogbamu8315
@blessingejogbamu8315 10 ай бұрын
Thanks for this video, It's clear to me now
@chillbackground4935
@chillbackground4935 3 ай бұрын
the most important part and you hide it by the camera then process to do nothing
@wasit-shafi
@wasit-shafi 5 ай бұрын
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
@GameDownloader112
@GameDownloader112 9 ай бұрын
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.
@pozzarefds
@pozzarefds Жыл бұрын
What happened at 1:37?
@tiagoaleffdasilva8092
@tiagoaleffdasilva8092 10 ай бұрын
I don't know too😢
@Adormir123
@Adormir123 3 ай бұрын
name of extension?
@HavingFunWithAvyan
@HavingFunWithAvyan Жыл бұрын
thanks for the video, very clear
@poonamgopinath2417
@poonamgopinath2417 8 ай бұрын
How do you handle those staged changes which got added to the feature while merging?
@craigfreeze2975
@craigfreeze2975 7 ай бұрын
What extension is this at the beggining?
@obinnachukwukere6890
@obinnachukwukere6890 9 ай бұрын
Cool...but not beginners friendly.
@user-kn2ou2pu3e
@user-kn2ou2pu3e 11 ай бұрын
Thanks so much!
@ehm-wg8pd
@ehm-wg8pd 5 ай бұрын
neat! thanks
@constantineconst3350
@constantineconst3350 Жыл бұрын
off thise camera man, do the tech content, not instagramm
@zakidzz
@zakidzz Жыл бұрын
hi can you make a project how to use an alredy provided a design system
@biccyBaggins
@biccyBaggins 16 күн бұрын
if your camera is covering UI your are trying to demostrate - move your camera 👎
@vedbhanushali608
@vedbhanushali608 Жыл бұрын
Thanks
@theone6504
@theone6504 Жыл бұрын
vscode is super diffficult to use
@michalnowak2181
@michalnowak2181 Жыл бұрын
thx
@talkohavy
@talkohavy 11 ай бұрын
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".
@jvnpnd2510
@jvnpnd2510 5 ай бұрын
too much bullshit
@cesaregb
@cesaregb Жыл бұрын
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?
@vamshikrishnareddy76
@vamshikrishnareddy76 Жыл бұрын
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
@whoman7930 Жыл бұрын
Sure, leave a message at, CuriosBasant#7850
@vamshikrishnareddy76
@vamshikrishnareddy76 Жыл бұрын
@@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
@rishiraj2548
@rishiraj2548 Жыл бұрын
Thanks
How to Resolve Merge Conflicts in Git | Open Source Bootcamp
24:17
This is the Only Right Way to Write React clean-code - SOLID
18:23
How I Did The SELF BENDING Spoon 😱🥄 #shorts
00:19
Wian
Рет қаралды 36 МЛН
Алексей Щербаков разнес ВДВшников
00:47
OMG what happened??😳 filaretiki family✨ #social
01:00
Filaretiki
Рет қаралды 12 МЛН
Fortunately, Ultraman protects me  #shorts #ultraman #ultramantiga #liveaction
00:10
Mastering VIM Motions in VSCode (Mouseless development)
7:41
Git merge and git conflicts
39:37
Hitesh Choudhary
Рет қаралды 19 М.
25 VS Code Productivity Tips and Speed Hacks
11:35
Fireship
Рет қаралды 2,3 МЛН
Why I avoid useEffect For API Calls and use React Query instead
17:45
git rebase - Why, When & How to fix conflicts
9:45
Philomatics
Рет қаралды 42 М.
Git rebase: how to resolve conflicts
7:32
Team Programmer
Рет қаралды 40 М.
Resolving Merge Conflicts in Visual Studio Code: Step-by-Step Guide
6:51
Monsterlessons Academy
Рет қаралды 1,7 М.
Stop Doing this as a React Developer
12:27
CoderOne
Рет қаралды 162 М.
Учимся решать git конфликты
8:24
Kovalevskyi Academy
Рет қаралды 21 М.
How I Did The SELF BENDING Spoon 😱🥄 #shorts
00:19
Wian
Рет қаралды 36 МЛН