No video :(

How to resolve merge conflicts in Git

Подписаться 54 тыс.

Просмотров 274 тыс.

50% 1

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/

Опубликовано:

2 авг 2024

Ссылка:

Скачать:

Готовим ссылку...

Добавить в:

Мой плейлист

Посмотреть позже

Комментарии : 193

@videogamesare1 3 года назад

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

@Ihatetomatoes 3 года назад

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 3 года назад

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 2 года назад

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 2 года назад

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

@khushalijiyani6397 3 года назад

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

@jeromederrick551 2 года назад

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

@netindu 4 года назад

Awesome demonstration. Simple and yet powerful !

@liorpolak1391 3 года назад

Excellent tutorial. Short and to the point.

@AnuragSingh-cx5ho 3 года назад

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

@oLunatiko 3 года назад

So simple and yet so powerful, thank you!

@user-mg7dn9oy8r Год назад

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

@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😃

@canicemichael7010 2 года назад

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.

@irislicb3343 2 года назад

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!

@theredbluecube2711 2 года назад

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

@phire0 3 года назад

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

@Ihatetomatoes 3 года назад

Thanks Jamie!

@BilligeWitze 4 года назад

Great video, short and simple, thanks

@HadayatNiazi-xp1fz 26 дней назад

pretty straightforward tutorial. Thank you

@Lu5ck 2 года назад

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

@davepipkin2743 3 года назад

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

@keifer7813 Год назад

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

@muradmagomedov5282 2 года назад

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

@pushparajpragadeesh5192 2 года назад

explained very clearly.. practice makes a perfect

@nirvanzentinal 3 года назад

Short and simple , Thank you

@Ihatetomatoes 3 года назад

Thanks Nirvan!

@ebuggs212 2 года назад

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

@daniellaerachannel 4 года назад

excellent video Petr!

@Ihatetomatoes 4 года назад

Thanks mate!

@cindyguan607 Год назад

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

@adebanjooluwasola4709 2 года назад

Great Video, The Simplicity is Bliss

@gracianomanuelhenrique9101 Год назад

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

@westfield90 3 года назад

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

@FiveFourThor 2 года назад

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

@cervece41 3 года назад

Pretty helpful stuff, thanks man

@hermestlse 9 месяцев назад

Most usefull video ever for whole humanity

@anhhoangleduc Год назад

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

@SATNAMSINGH-pb7gc 2 года назад

Thanks for this video helped me through the problem

@rryann088 2 года назад

Thanks for this, This helped me big time

@ProSimples 3 года назад

I really appreciated your help.

@two2657 Год назад

Very accurate and straightforward. Thakusomuch

@jshvaron Год назад

THIS HELPED SO MUCH. THANKS!

@nagarajmpn 2 года назад

Thanks a lot! I have got started.

@chandukumar2402 2 года назад

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

@aisak4753 2 года назад

Amazing tutorial !

@shamimanasrin3269 2 года назад

Thank you so much. It's so helpful

@tomaslopez9999 2 года назад

Thanks for creating this video

@enssahfayiamomoh8410 11 месяцев назад

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

@christopherpink842 2 года назад

THANK YOU !!!! simply explained

@mr.hussain8714 Год назад

Thanks man, this helped me a lot.

@jakemeyers1381 2 года назад

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?

@sanskritisinghrathore3022 2 года назад

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

@TechWorldwithPankaj 3 года назад

Explained good in sort time

@attamjotsinghkhurana4473 4 года назад

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 ?

@serjmarkelov9915 Год назад

Thank you so much!

@Libertoso Год назад

Thank you very much

@uroscesnik-ferlan9956 4 месяца назад

Thank you very much.

@taras3028 Год назад

hooh, Thanks for explaining, you are awesome

@yyypsycheguy 7 месяцев назад

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

@iamviduranishantha 4 года назад

Thanks saved my day.

@Ihatetomatoes 4 года назад

No worries, great to hear that it helped!

@DereC519 Год назад

this helped thanks

@jonathanshitrit6344 4 года назад

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 4 года назад

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 2 года назад

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

@angelsebastianbellomateo6954 Год назад

Pretty helpful. Thanks

@Lumary 3 года назад

nice, thank you! :)

@hamidja1537 Год назад

Thanks for sharing

@ravikarri6161 Год назад

Thank you!

@bshwjt 2 года назад

Nice video; thanks for sharing

@usmansbk 3 года назад

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

@reedyseth 2 года назад

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!

@YuriyChamkoriyski 2 года назад

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.