Me too. Ever since I made my own repo and have been consistently making changes to it, it has been getting easier and easier. I now am starting to understand different concepts. It is alot easier than I thought it was in my mind.
"... 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
That was funny, but jokes a side, if I'll make changes in other branch, feature-d, and then merge it to master, wouldn't it have the same result as someone who made edits in master? For the next person that want to merge to master, wouldn't it be the same? Maybe it's just less safe? Help me out here😅
@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 UA-cam instructors in the way you explain everything step-by-step! Keep up the good work!!
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!
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
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 " 🤣😭🤣
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.
"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 "
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?
Shaun, I would like to ask a small question. Let's imagine that 2 persons working on new features and it is time to merge them to the master branch. The first merge is done and while doing the second one it will be inevitable a conflict, right (because the master branch is changed)? How to avoid it, thanks.
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 .
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
I tried to watch other youtubers videos about git, but when I watched your playlist even after 7 years I got it beneficial and beginner friendly.
Great to hear! :) glad it was helpful Zaidkhan
"Yeah! I'm terribly original!" You rock....And these tutorials are just awesome....
ahahah I just made a comment like this without seen yours
Thanks man. All my fears about starting with git have disappeared. Ready for the github videos now! Cheers!
me too i'm scared of that sht
Me too. Ever since I made my own repo and have been consistently making changes to it, it has been getting easier and easier. I now am starting to understand different concepts. It is alot easier than I thought it was in my mind.
Thank you very much for the clear explanation! Even 5 years after this tutorial is still relevant
Great to hear, thanks Jose!
@@NetNinja I second that. Still useful!
@@benfrese3573 that's because git hasn't changed much
"... 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
Lol he basically called me out 😂😭😂 what can I tell ya... noobs will be noobs 😭👽😌😂
😂
That was funny, but jokes a side, if I'll make changes in other branch, feature-d, and then merge it to master, wouldn't it have the same result as someone who made edits in master?
For the next person that want to merge to master, wouldn't it be the same? Maybe it's just less safe?
Help me out here😅
@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 UA-cam instructors in the way you explain everything step-by-step! Keep up the good work!!
When I started with GIT, I was one of those people who were updating directly master :D until everyone was complaining :D
"Yep i'm terribly original" that's why you're easy to follow !! Love you Sensei from Sénégal
Gold. Pure gold! I was so scary to touch that area of git! And now everything clear! Thank you, Ninja!
we love you Shaun. I am very appreciative of what you do for us! keep up the fantastic work.
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.
you did a great job at simplifyng this issue with those branch names and examples
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!
"And we don't do it in the text editor, we do it over here"
always gets me! Lol
Thanks for this bro!
"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
Thanks! 😃
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.
Don't understand why that dislike on the video... Best explanation ever, very detailed. :)
@The Erudite it has 1 dislike now. Not a complaint, rather an observation
OP didn't show how the Merges worked in the Master branch.. That is a fail, if you ask me. TD
@@Ahmed-od3sp 23 dislikes now
Probably a master branch developer and his friends
when the person who made the tutorial has a accent like this you know the tutorial will be good
By far the best tutorial on Git. Thanks a lot man!
Two thumbs way up for this! Thanks for clearing up a lot of confusing tutorials.
#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
currently a Master branch updater. Cant wait to master Branches and Merging. Thanks mate!
your tutorials is always detailed, easy to understand and very helpful
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 :)
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 could also support him on patreon www.patreon.com/thenetninja
Thanks dude, i really enjoyed the explanation, "Yup, those people do exist" jaja indeed they do
I think you solv my issues. great video btw
Dude, this tutorial is awesome!! I found just what I needed. Thanks man!!
Thanks for these tutorials. You're a lifesaver!
I enjoy your short funny and very informative videos. you truly are a legend :D
Thanks Bogdan! :)
Very simple merge conflict tutorial. Thank you.
"You get this scary screen again". Thanks dude. Always the best.
Great stuff :)
It was me. I was the upstart. I exist. Thanks for showing me the error of my ways
Thanks a lot man, this stuff used to confuse the hell out of me.
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 " 🤣😭🤣
best teacher ever
thanks for the tutorial, you should have a billion subs, but you have only 693 omg , nice video
Finally great explanation.
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.
I love your explanation. Please make a video about rebase, and compare it with merge. Thanks
start at 5:30
"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 "
Bloody hilarious and educational video. I love it, thanks! 🙃
Very helpful video.. You presented your material in a very clear way.. Thanks!
best to the point tutorial
just great tut 👏straightforward and easy to follow. new sub :)
I really like your explanation. Very useful. Thanks for this great video.
Just started my firsty game jam and learning to use git at the same time. I am that intern :)
You are amazing Bro keep it up
Thanks a lot explained in a simple and concise manner
Love the way you explain.
You are the best! Thank you sooo much!!!
Glad it helped! :) thanks for watching
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?
Oh my, you really are awesome! Thanks.
Super helpful and clearly explained. Thanks.
Shaun, I would like to ask a small question. Let's imagine that 2 persons working on new features and it is time to merge them to the master branch. The first merge is done and while doing the second one it will be inevitable a conflict, right (because the master branch is changed)? How to avoid it, thanks.
You saved so much of time, thank you!
This was very helpful. Thank you very much
I hope you also make video on more advanced git
Thanks Rai! :)
straight up knowledge, no bullshit
Great and simple explanation, thank you!
Thanks, man, this really helped me.
Thanks for your tutorials, are very helpful.
Awesome to hear that and thanks for watching, Paweł
Thanks a lot for these tutorials. Really helpful
Excellent tutorial
can a conflict still occur if the new employee edited in a branch then merge and the old employee edited in a branch and merge? at 05:58
Wonderfully explained. Thanks
Thanks again. Great lesson!
This is very useful and very clear
Thanks Calibike, glad to hear that! :)
2:55
Need to dig deeper to understand what's actually happening for different merging strategies.
This mentioned two:
- Fast forward
- Recursive
Nicely Explained. 🔥🔥
That upstart, lol.
-anyways, Thanks the Net Ninja, you saved me a lot.
great video! Helped a ton. Awesome channel name!
Thanks 😀
Thanks for this great explanation
Thank you! for making it simple.
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 .
Great one, thanks. In 'master', with 'git log --online', why is 'Merge branch feature-a' not showing ?
Thank you so much for these videos. Why do I never see you use git push? I thought it had to be used after every git commit
Great explanation! Thanks
Thanks Drew :)
Thanks a lot, that was straight forward.
awsome ! thank you i wish u all the best
Thanks for watching Nadjib!
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
just started my first job and i did commit on the master branch , hahaha yes those people do exist ..ME !! 😁😁
Nice video, very helpful!
Thanks matheus!
Best explanation. ☺
You're a game changer
You are a good man! Thank you
If I may ask, what terminal are you using? Is this like a skin for the windows 10 command prompt or just another program perhaps?
Thanks. Very helpful.
This is very cool stuff
this was so useful, thank you sooo much
you should definitive use displayfusion or any program similar to specify an area for each window
Great tutorial bruh!
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
Useful and a life saver!
great video!
Thank you :)
nice tutorial I learned a lot!
excellent job!
very good video dude