How to resolve merge conflicts in Visual Studio Code | Fast tutorial 2020

This quick git tutorial shows you how to resolve merge conflicts in VS Code. This tutorial has an example of a merge conflict in Visual Studio Code after pulling master. I explain the difference between Accept Incoming Change and Accept Current Change. For more quick tutorials, check out my other fast git / VS Code tutorials! Thank you for watching!!

[maddevskilz]

Concise and useful. What more could you want out of a tutorial video? Thank you!

[roflchopter]

Any way to resolve the merge conflicts from the side-by-side view you get from "compare changes"? "compare changes" gives a side-by-side comparison, but both sides are read-only.

[MK_SA]

Very straightforward video ❤, lot of don't specify it like this. Especially for beginners ❤❤

[AbirHasnat]

Thank you, Carmelle, I was looking for straight forward solutions just like this :)

[david]

short and to the point, just subscribed as a token of appreciation.

[sutoraika]

thank you for this very nice tutorial. very informative. keep sharing knowledge

[TheDiabeticWay]

thank you for this helpful video that got me out of a few issues I was having and getting your video did not help me on all these issues but was a great help on getting me through my issues! Thank you so much for making this vido! :-)

[gmayas]

How do I pass my changes from one branch to another locally in VSCode ?, for example: I work in the Add Contacts branch (I Relaize ADD, Commit and Push) and I want to pass those changes, locally without Pulling, from Add Contacts to a new raman which is called Add data. Add contacts -> Add data.

[BeSwagy]

Hello, I am a beginner.

I just want to know that in your code of html showing the time of edit the code. Is that any extention or any setting. Please tell me

[SanjeevKumar-hsgp]

Very Helpful video form me as beginner :)

[scottisitt]

1:30 I had chosen "accept incoming change" on one of my practice projects but now VS Code has deferred to that option every time there's a conflict, so I've lost the option of choosing how to resolve the conflict manually. Do you know how to fix that? EDIT: It seems to be fine now (after my computer has been shut down and turned back on), but when I first posted this question, it was accepting the incoming change without asking me first.

[RAVIRAJLADHA]

Is there any extension in vs code which is doing the comparison or giving warning?

[omgharajuku]

Thanks for saving my azzz with this video

[mverma]

oh wow, that was actually really easy LOL thanks Carmelle.

[NAvArS]

i got the same but confused of to use master or my local branch to resolve this

[jorish]

Does this require some extension for vscode? I'm new to vscode. When i type i the merge command in the terminal, i get a merge conflict. But i don't see they markup in the file in green and blue nor options to accept changes? I do see an exclamation mark next to the file with merge conflict in the file explorer.

[kavvashivareddy]

For saving we need to use cntrl+s or normal S?

[anandu]

hey, I need your help. I sometimes gets these conflict messages. But often they never ask to accept. They are simply overwritten. Is there any extension so that each time i make a merge request there should be a warning?

[piyushaggarwal]

Whoa man! I have been in this situation many times but I tried to search for a solution this time. You won't believe that I never saw the line which has the options accept current change.... I never saw it 😂😂

[passionthevirgo]

Even after you ask to pull, it still says "Already Up To Date", which by the way, how is it even possible to pull without specifying where you're pulling from? Where are you even pulling from, another branch, a sperate file, and entirely different repository all together? I can't figure it out. Here it seems like the merging conflicts tool is handing itself to you on a silver platter, whereas I get nothing but fatal errors and Already Up To Dates when there is no way that I can be update when I haven't even committed it yet. That's another thing! Do you commit and push before or after the merged conflicts? Do you push at all, or should I just wait till everything has ben fixed? Nothing against you, I just feel like there is so much more to this than what this video is explaining cause I'm pulling my own limbs off trying to solve this.