How to resolve merge conflicts in Git

Git merge conflicts can be confusing and frustrating.
If you want to learn how to resolve git merge conflicts, this tutorial is for you.
What you will learn in this Git config tutorial:
- when do git merge conflicts occur
- how to resolve merge conflicts in VSCode
What do you hate the most about merge conflicts? Let me know in the comments.
Premium Online Courses for front end developers and designers.
ihatetomatoes.net/store/

[@videogamesare1]

Thanks, I was genuinely about to call the local fire department when I ran into a merge conflict.

[@Ihatetomatoes]

Haha, fire department is always handy 😂

[@shadyfixtech4763]

😂😂

[@marvine71]

😂😂

[@StijnDeWitt]

IT people never call the fire department when there is a fire! They send an e-mail.

[@Readonly5964]

😂😂😂😂 me too bro

[@tristanhofer7399]

I was totally frustrated by the merge conflicts. Your tutorial was easy to understand and helped me to solve all conflicts. Thank You!

[@NA-sq1pt]

I never like or comment on videos, but your words of encouragement at the end mean so much to a self-taught coder that I had to let you know. Thank you!

[@dereksargent9624]

This was amazing! 10/10. One of the most informational and concise videos I've ever watched

[@khushalijiyani6397]

Thanks for such a clear explanation. I got this merge conflict in my first pr. This video helped a lot.

[@netindu]

Awesome demonstration. Simple and yet powerful !

[@jeromederrick551]

Most importantly, thanks for your encouraging words at the end! It gave me confidence!

[@oLunatiko]

So simple and yet so powerful, thank you!

[@liorpolak1391]

Excellent tutorial. Short and to the point.

[@AnuragSingh-cx5ho]

Thank you so much I am new in VS code and git , I was stuck now it's clear for me thanks once again

[@fortunemxoza3113]

Thank you so much for this tutorial. It was so easy to understand and it saved me lots of time! Keep up the good work😃

[@user-mg7dn9oy8r]

This genuinely helped me understand git merge so well !!!! Thanks a lot dude !!!!

[@canicemichael7010]

Thank you so much, I first ram git merge --abort to get off the hook i was in, then understood how to resolve conflicts.

[@Jessy150]

I was panicking and thought to abort the merge. But this tutorial has saved my life! Thank you so much.

[@davepipkin2743]

Very informative! Thank you! I feel like I finally "git" it!

[@theredbluecube2711]

I re-made my repo 2 times, finally you saved my life

[@BilligeWitze]

Great video, short and simple, thanks

[@FiveFourThor]

hahahaha the desciprtion of the "--abort" was super funny! I'll never forget it now LOL

[@phire0]

Thanks for this, your videos are very informative and easy to follow :)

[@Ihatetomatoes]

Thanks Jamie!

[@keifer7813]

Fantastic video, helped a lot. Like your sense of humour too 👍

[@muradmagomedov5282]

Wow, i really did not know that Moby also knows Git. Thank you a lot bro!

[@ebuggs212]

PHEW! I panicked when i first came across this error. Thanks for this tutorial! Much obliged!

[@adebanjooluwasola4709]

Great Video, The Simplicity is Bliss

[@raiyan22]

Thanks for this, This helped me big time

[@Lu5ck]

Thanks, didn't know vscode can be used like that, was trying hard to get it work. I'm really new to this git thing

[@cervece41]

Pretty helpful stuff, thanks man

[@pushparajpragadeesh5192]

explained very clearly.. practice makes a perfect

[@ProSimples]

I really appreciated your help.

[@jshvaron]

THIS HELPED SO MUCH. THANKS!

[@nagarajmpn]

Thanks a lot! I have got started.

[@nirvanzentinal]

Short and simple , Thank you

[@Ihatetomatoes]

Thanks Nirvan!

[@two2657]

Very accurate and straightforward. Thakusomuch

[@chandukumar2402]

Thanks .. This video help me a lot to resolve all conflicts.

[@shamimanasrin3269]

Thank you so much. It's so helpful

[@aisak4753]

Amazing tutorial !

[@HadayatNiazi-xp1fz]

pretty straightforward tutorial. Thank you

[@christopherpink842]

THANK YOU !!!! simply explained

[@mr.hussain8714]

Thanks man, this helped me a lot.

[@westfield90]

I always get an heart attack when I see conflict. This always freaks me out

[@TechWorldwithPankaj]

Explained good in sort time

[@SATNAMSINGH-pb7gc]

Thanks for this video helped me through the problem

[@tomaslopez9999]

Thanks for creating this video

[@enssahfayiamomoh8410]

Great teacher, thank you!
I need to watch videos on DOM

[@daniellaerachannel]

excellent video Petr!

[@Ihatetomatoes]

Thanks mate!

[@irislicb3343]

Hi, excellent tutorials! Also it has been a great idea to add the commands being used in a big label text, much appreciated. My questions is, when you are merging pictures (.png .jpg) to resolve conflicts, is it the same process as when you merge text? Thank you!

[@anhhoangleduc]

i'm newbie, thanks for your guide, practice make perfect

[@Lumary]

nice, thank you! :)

[@angelsebastianbellomateo6954]

Pretty helpful. Thanks

[@usmansbk]

Thanks for the video. I'll not only smash the LIKE button, but I'll also smash some tomatoes!

[@Libertoso]

Thank you very much

[@hermestlse]

Most usefull video ever for whole humanity

[@bshwjt]

Nice video; thanks for sharing

[@sanskritisinghrathore3022]

Hi Git merge explanation is really great,pls make a video on Git rebase in detail ... thanks a lot ...

[@suppotdekimjong-un5615]

Thank you. I didn't understand what HEAD

[@iamviduranishantha]

Thanks saved my day.

[@Ihatetomatoes]

No worries, great to hear that it helped!

[@abhisheksarangi3844]

Saved my day

[@taras3028]

hooh, Thanks for explaining, you are awesome

[@themichael8767]

Thank you very much, Sir)

[@gracianomanuelhenrique9101]

I enjoy the video, and your way to speak English, It is very understandable

[@sleepingcrap5597]

"The famous conflict which everybody hates" aah those words really touched my soul

[@EricAbroad]

Thank you!

[@serjmarkelov9915]

Thank you so much!

[@DereC519]

this helped thanks

[@Yev300]

That logo is lit :D

[@uroscesnik-ferlan9956]

Thank you very much.

[@luantorres3758]

you saved my life

[@hamidja1537]

Thanks for sharing

[@ARJavan]

Thanks man!

[@JavArButt]

Thank you, tomatoes guy

[@user-el9kk8mn5o]

İt's work very well thank you

[@AK-tt7fc]

Very helpful

[@thepredestined7637]

amazing video

[@englishisclearnow4293]

You are the master . macha Allah .

[@Frogieder]

Thank you

[@Arya20012]

Thank you sir ❤❤

[@SATNAMSINGH-pb7gc]

Thanks for the video (comment through api)

[@subramanianbalagopalan2866]

superb

[@jakemeyers1381]

Thank you for all the videos! Gotta ask, what's your bash profile script to make it folder > branch with the colors and what not?

[@siddhant2002]

You just saved me 😌

[@p_deges]

thank you

[@cindyguan607]

great content, thank you! btw what is the extension that you are using which shows the branches?

[@saadthayab]

thank you

[@reedyseth]

This is a great example for conflicts in a single file.
Do you have another example where you move the file `content.txt` into another folder, then another user add changes into `./content.txt`, but in the original path. git will mark the files as deleted. So the changes that were added into the original path will not be added into `new_folder/content.txt` having an example of this will be great!

[@rosaal9030]

thank you you are perfect

[@ahmadm520]

Thank you Git master

[@jihadchakrane3562]

thx u so much

[@hermessantos181]

thank you, mate, I was lost here...

[@diabyalfa]

Thanks

[@attamjotsinghkhurana4473]

Informative video, but my question to you is , when you resolved conflicts and add a new commit message , dont you think it will push a new commit message and later on when you compare two different branches , you will again find some conflicts . As your branch is one commit ahead or behind ?

[@abdelkrimeljaouhari2370]

git status would not be happy more than me now , many thanks .

[@jonathanshitrit6344]

Thank you for such an informative yet simple explanation! Are you using any VSC extensions for git to get those small Accept Change buttons?

[@Ihatetomatoes]

Thanks Jonathan. I believe they are part of the build in Git integration. I will talk about Git extensions in the future. Anything else you would like to see covered?

[@thepropellersitcenter4056]

Yes, very great and informative, I didn't get the small accept change buttons thing too, and now i'm stuck, please any git command to proceed with ? I want to accept both changes. Thanks

[@user-bx7ly2th3b]

Thanks for video it helped me a lot! How to make git bash looks like yours?

[@YuriyChamkoriyski]

Thanks for your video. It was very useful and easy to understand. I have a question, though. I like your colored terminal prompt. How can I have this? Is it s plugin? Please, reply.

[@shivajijadhav5300]

thank you sir. git merge --abort

[@ajitsakri9888]

how can i get that git teminal UI

[@yyypsycheguy]

Thanks for the vid. Just a quick question: what is the merge tool you are using here?

[@SzTz100]

Nice

[@sensai7213]

Thx for the video. What about if you have multiple file conflicts? will you add git add. file1, file2, file3....?

[@coderamrin]

haha, loved this one

[@mikesoertsz222]

I never expected to be learning Git from Moby.