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

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

thx that helped me a lot;)!!!

Very Helpful video form me as beginner :)

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

HELP

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

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

'The file contains unhandled conflicts'

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 😂😂

Saved my day 🧡

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.

Thanks for saving my azzz with this video

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

Thanks

When I click merge, the documents just disappear and I can't do the commit, does anyone have this problem?

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

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.

Thanks!

Bleh. Jetbrains tools are the only ones that actually do this right. What about when you have a block of code and need to merge both together in a custom way? Like you added a method call, but someone else renamed the variable. There's no way to view the incoming code and local changes and write a new line that combines both.

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

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! :-)

Thank you

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

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?

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

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.

Thank you

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.

thanks !!!
saludos desde chile

you are amazing , thanks alot

Moar pleez!