Git & GitHub Tutorial for Beginners #9 - Merging Branches (& conflicts) 

"Yeah! I'm terribly original!" You rock....And these tutorials are just awesome....

"... now I want you to imagine that some upstart new at the company has decided to just make edits on the master branch. Yep, those people do exist." This is where I cracked. XD

Thanks man. All my fears about starting with git have disappeared. Ready for the github videos now! Cheers!

Thank you very much for the clear explanation! Even 5 years after this tutorial is still relevant

When I started with GIT, I was one of those people who were updating directly master :D until everyone was complaining :D

when the person who made the tutorial has a accent like this you know the tutorial will be good

"Yep i'm terribly original" that's why you're easy to follow !! Love you Sensei from Sénégal

"and we don't do it in the text editor we do all in the terminal" 😅 just for have fun. you have the best explanation, thank you for this tutorial

@The Net Ninja: I just found this tutorial when I was trying to understand a good workflow and common use case for branches and merging. And I must say you are one of my favorite RU-vid instructors in the way you explain everything step-by-step! Keep up the good work!!

Gold. Pure gold! I was so scary to touch that area of git! And now everything clear! Thank you, Ninja!

I had to do my first merge into production code and I watched this video to make sure I don't f* it up! Thanks man, I love your videos.

"And we don't do it in the text editor, we do it over here" always gets me! Lol Thanks for this bro!

you did a great job at simplifyng this issue with those branch names and examples

we love you Shaun. I am very appreciative of what you do for us! keep up the fantastic work.

Don't understand why that dislike on the video... Best explanation ever, very detailed. :)

Thanks dude, i really enjoyed the explanation, "Yup, those people do exist" jaja indeed they do

By far the best tutorial on Git. Thanks a lot man!

I was so confused about how to resolve conflicts in files, VS Code also makes it a little more intimidating with different functions, messages and whatnot, but this helped me to understand what it actually all does, how it happens and how to resolve them. Thank you!

I enjoy your short funny and very informative videos. you truly are a legend :D

currently a Master branch updater. Cant wait to master Branches and Merging. Thanks mate!

I think you solv my issues. great video btw

Two thumbs way up for this! Thanks for clearing up a lot of confusing tutorials.

By far, the best explanation on this. 3rd video I had to watch since the literature Im going over was blurry on my head. Subscribing now.

Finally great explanation.

You are a truly gifted instructor! I recently purchased a udemy course on git and GitHub, however the explanations on it weren't that great. I'm probably gonna refund that course cos your course is so much better. And it's free! P. S. If you do make a udemy course on this I'd definitely purchase it

"You get this scary screen again". Thanks dude. Always the best.

best teacher ever

that little "upstart" damn him ! Touching things he's not supposed to ! anyway im glad he did otherwise you wouldnt have done a video on it ! thanks ninja really enjoyed it👏 ...." mumbo jumbo " 🤣😭🤣

Oh my, you really are awesome! Thanks.

You are amazing Bro keep it up

Great stuff :)

Dude, this tutorial is awesome!! I found just what I needed. Thanks man!!

You are the best! Thank you sooo much!!!

Thanks for your tutorials, are very helpful.

thanks for the tutorial, you should have a billion subs, but you have only 693 omg , nice video

just great tut 👏straightforward and easy to follow. new sub :)

your tutorials is always detailed, easy to understand and very helpful

straight up knowledge, no bullshit

Your explanation was fantasic, sir! This is definitely not very simple stuff but you made it seem like a breeze to do, really appreciate it :)

Very simple merge conflict tutorial. Thank you.

It was me. I was the upstart. I exist. Thanks for showing me the error of my ways

Bloody hilarious and educational video. I love it, thanks! 🙃

This was very helpful. Thank you very much I hope you also make video on more advanced git

Thanks for these tutorials. You're a lifesaver!

#HepperleVidIndex 1:39 - Merge branch into master: 1) git checkout master; 2) git merge branch name 3:46 - Resolving merge conflicts: 6:26 - "Automatic merge failed" 7:40 - Fix merge conflicts (in the applicable files) then git add .; git commit

You saved so much of time, thank you!

This is very useful and very clear

I really like your explanation. Very useful. Thanks for this great video.

Thanks, man, this really helped me.

Super helpful and clearly explained. Thanks.

Thanks a lot explained in a simple and concise manner

Very helpful video.. You presented your material in a very clear way.. Thanks!

best to the point tutorial

Great and simple explanation, thank you!

Love the way you explain.

I love your explanation. Please make a video about rebase, and compare it with merge. Thanks

@4:20 "Yup, those people do exist", fucking lol

Thanks a lot for these tutorials. Really helpful

"git branch" does the same as "git branch -a". i used to use "switch" instead of "checkout" to walk to different branches :) . plus, "git checkout -b " is equal to "git switch -c "

Thanks again. Great lesson!

Just started my firsty game jam and learning to use git at the same time. I am that intern :)

That upstart, lol. -anyways, Thanks the Net Ninja, you saved me a lot.

Wonderfully explained. Thanks

Thank you! for making it simple.

Great explanation! Thanks

You're a game changer

Thanks. Very helpful.

Thanks a lot man, this stuff used to confuse the hell out of me.

Nice video, very helpful!

This is very cool stuff

Thanks for this great explanation

awsome ! thank you i wish u all the best

Thank you :)

Excellent tutorial

Had a query, what if there are lots of files in which we made changes, even then we will have to remove those extra lines manually?? #please_answer

Nicely Explained. 🔥🔥

great video! Helped a ton. Awesome channel name!

You are a good man! Thank you

or you can merge it using bash and then after opeining that file using VScode and it will give 3 options apply local chnages apply remote changes Apply both This will come usually when you are facing these type of issue , Code in the master branch (which would be in remote) would be different or you can say step ahead of you .

Thanks a lot, that was straight forward.

So, if there are two people who've each made a branch to work on different features need to commit back to master because they're done with their features and they happen to have modified the same files, would that not be the exact same scenario? Wouldn't whoever happened to finish first become the "upstart" in the video despite doing it the way they were supposed to?

sooo smooooothhhhhh

just started my first job and i did commit on the master branch , hahaha yes those people do exist ..ME !! 😁😁

very good video dude

Useful and a life saver!

i have a question why don't you use git push after commit ? is it for educational matter or what ? thank you by the way for the videos they are perfect clear and straight to the point

this was so useful, thank you sooo much

Thanks Man!

nice tutorial I learned a lot!

Best explanation. ☺

great video!

Thank you so much for video!!

great man

Thank you!

excellent job!

wonderful

you should definitive use displayfusion or any program similar to specify an area for each window

On 2:48 mine shows merge made by the 'ort' strategy, upon searching on their documentation it says Ostensibly Recursive’s Twin which basically replaces 'recursive' strategy but faster.

Great tutorial bruh!

this is best...!!