Introduction to Git - Branching and Merging

[@Nadzinator]

Not only is this a great instructional video, but David uses a solid pedagogical approach: he tells you what he's going to tell you, he tells you, then he tells you what he just told you.

[@DavidMahler]

Thanks for noticing ;-).

[@henrynwosu6277]

Very true. Said what was in my mind. The fact that he keeps track of all the information for you shows how empathic he is. Leaves no room for ambiguity. No room for confusion. ❤❤❤ Thanks @DavidMahler Thanks alot.

[@ruixue6955]

00:59 start a new git repo 1:46 git commit -m "create S1" 2:08 git commit -m "create S2" 2:13 git log 2:35 what is branch 3:02 how is branch implemented 3:14 every *commit* has a *40 hex decimal sha-1 hash* 3:26 a *branch* is just a *pointer* toa sha-1 hash 3:43 the way git knows which *branch* we are on is a speical pointer called *HEAD* 3:49 *HEAD* 4:05 in git termonology, the *HEAD* pointer tells what we have *checkout* 4:27 git log --all --decorate --oneline --graph 4:30 when run this, we see the *commit graph* 5:05 create new branches 6:03 checkout and work on branches 6:12 git checkout SDN 7:04 demo 9:18 git commit -a -m "message" 9:21 -a option will stage and commit any tracked files that has been modified 9:49 9:53 integrate changes back into master 10:08 fast-forward merge 10:54 demo 11:04 *git diff master..SDN* 11:20 git merge SDN

[@prakharsrivastava3799]

Why this indentation?

[@TuNguyen-ox5lt]

extremely great explanation and graph illustration . really easy to understand more than any tutorials about git I found .

[@DavidMahler]

Thanks so much!

[@dpskane]

I had exactly the same experience. Inferior explanations all over the web. This video tutorial takes longer than reading through stuff, but it's a surefire way to understand. Only direct P2P tutoring trumps David's video

[@deepwaterDW]

I watched 2 entire git tutorials, couldn't understand them untli I watched this video. Props to this guy.

[@ruixue6955]

the best tutorial i have till now

[@mitravindgarg5372]

Same here !

[@rahulagrawal5074]

It's so awesome.. This video is packed with information . It's like 3hrs content in just 29 mins and you will still understand everything

[@DavidMahler]

Thanks!

[@dpskane]

Best git tutorial I encountered so far. For some surely too fast, for others too slow, but for most *beginners* it's surely perfect

[@DavidMahler]

Sure, thanks!

[@riley3675]

Demonstrating what you're going to do with the graphical solution, then after; explaining it using the commandline is like the perfect method for teaching this subject.

[@DavidMahler]

Thanks Riley!

[@luis_moura]

Finally a great tutorial with "real life" meaningful examples. Thank you sir!

[@DavidMahler]

Thanks for the comment Luis!

[@joules9004]

I love how he puts a quick review at the end. Very Concise. Very Understandable. Very Helpful.

[@DavidMahler]

I appreciate that!

[@vfxmaster7596]

others Git tutorials are not even close to this one.this is a masterpiece. i always had problem with git understanding and now i just love to use git professionally.Thx man

[@DavidMahler]

That is great to hear that it helped you - thanks for the comment!

[@edkok5880]

Best git tutorial I have seen. Although sometimes a little fast. Looking forward to the next one. Thanks for your work.

[@DavidMahler]

Thanks Ed, yes I've heard that a couple of times, I'll take it into consideration in future series.

[@pslamba]

On the video, you can go to "settings" and "playback speed" and reduce the speed to your desired outcome.

[@spacetime314]

@@DavidMahler please don't. It's preferred more knowledge in less time. That's the pause bottom for, so people can play it again and again. Your teaching was on spot.

[@spiros1994]

Perfect explanation! I usually apply fast forward to the videos I see on youtube but this video has the right speed and also covers the topics perfectly. Thank you for your work

[@DavidMahler]

You're welcome, thanks for the comments!

[@oninloop]

One of the best git branching/merging fundamentals I've seen

[@AkshuGotuDance]

Awesome to the point. Better than 2 hours of Udemy videos and this one is completely free. God bless you.

[@DavidMahler]

lol, thanks a lot for taking the time to comment!

[@rajkumawat8671]

This video is far better than other tutorials where they just tell you commands and move forward. Language used is pretty simple and easy to understand.

[@DavidMahler]

Thank you!

[@dipto100]

Thanks for such a clear cut and specific explanation of the different cases when branching. It's really helpful to know beforehand what to do if any problems arise when starting to use Git.

[@arinekandem]

Best explanation of working with git branches I have ever come across. Reading git docs is like reading Chinese. Following this I actually now know what I'm doing. Thanks so much!

[@DavidMahler]

Lot's of technical documentation is rough for me too, which was one of my main motivators for videos like this.

[@boblittle2529]

Well finally! This is the first tutorial I've watched about git branch where I've actually understood what "detached head" means. More importantly, I finally got a clue as to how to resolve it. BTW: Presentation speed may be a little quick but personally, I'm ok with that; "pause" and "rewind" work pretty well.

[@cuteflygon]

One of the clearest git explanation I have seen and it is very detailed. I would recommend this to the people I know who wishes to learn git.

[@DavidMahler]

Thanks for that!

[@sreeramch]

One of the best GIT tutorials..Simple and to the point...thanks a lot David

[@DavidMahler]

Thank you sir!

[@vistorjohansson]

Fantastic tutorials. Simple, straight forward, gets to the point quickly, just the right speed and very easy to understand, thanks alot!

[@DavidMahler]

Thanks!

[@KempoSensei]

Just what I’ve been looking for. Thanks.

[@DavidMahler]

Great! Thanks!

[@mathewkargarzadeh3158]

Perfect Illustration on fixing the merge conflict and detached head. Dear David, you are the best !!! appreciate your time for posting your know how and educating everyone here. Thank you !!

[@DavidMahler]

Thanks a lot for the comment!

[@James_Hallam]

Great coverage of the fundamentals, thank you. It's 15 years since I wrote any code in anger (ie, pre-Git), so this was a much needed primer to shake loose my SVN-based misconceptions!

[@DavidMahler]

Git made me very angry for months when I had no clue what I was doing with it at first. Thanks!

[@kresimircosic3753]

This is a masterclass tutorial with proper examples and explanations. Well done sir.

[@DavidMahler]

Wow, thanks!

[@richt8183]

This is a great tutorial. The visuals are excellent. I really “git” it now!

[@DavidMahler]

Thanks again!!

[@mikehillbilly4079]

Precise, concise and clear. No ums and arrs just well prepared delivery. Excellent!

[@DavidMahler]

Thanks!

[@DavidMahler]

I edit those out ;-)

[@brandonflorida1092]

Glad someone is explaining this clearly, but sometimes you go very quickly. Remember that we are absorbing new concepts as you speak.

[@DavidMahler]

OK, thanks for the feedback!

[@RJCuthbertson]

I had the same problem, but luckily, through the wonders of modern technology, I was able to pause and rewatch the parts I needed clarity on.

[@phildunn3195]

Yeah, I'd say, just pause between points rather than going "slower"

[@appleqor]

I'm __GLAD__ you go quickly! 28min is long enough, and KZbin EASILY allows left arrow to rewind to replay something!! Thanks :)

[@appleqor]

@Phil I think you're suggesting the viewer should pause, not Mr. Mahler, right?

[@bioanu]

You rarely find the perfect combination of quality and generosity on the internet. This is one of them. Thank you very much! I hope that at some point I can do this too!!

[@DavidMahler]

Thanks Bioan that was very kind!

[@KunalMukherjee3701]

Cuts straight to the chase, kudos to you!

[@DavidMahler]

Thanks again Kunal!

[@harshitsxxd]

Never thought someone could explain git in such a simple & understandable way, kudos!

[@DavidMahler]

Thanks!

[@obalfaqih]

Well explained! It has never been clearer to me, thank you so much for this informative tutorial.

[@DavidMahler]

Thanks Omar - thanks for watching!

[@QuantumWithAnna]

Before I watched this video, "detached head" message struck terror in my heart, but no more. Many other points of confusion and frustration have been resolved.

[@DavidMahler]

LOL!

[@mohitnegi3641]

This is one of the best resources for learning merge. Thanks a lot, sir. Keep the good work going

[@DavidMahler]

Thanks!

[@luke2937]

This is like a video you'd see made by the government for the standard way to do something. Informative, to the point, and clean.

[@DavidMahler]

:-) thanks!

[@KrishnaKumar-np3tw]

Just incredible, as David's previous video on git basics. Thank you!

[@DavidMahler]

Thanks again!

[@MarcMcRae]

Really enjoying the clarity & visual illustration of your explanations David. Best I've found on the subject.

[@ruixue6955]

11:54 deleting branches 12:33 git branch -d SDN 13:18 there is no direct path from the master branch to the auth branch => 13:27 3-way merge 13:30 3-way merge 14:04 demo: git merge auth 14:16 the output does not say fast-forward merge like last time 14:29 git branch --merged 14:51 *merge conflicts* 16:32 17:33 demo: git merge dev 20:27 *detached HEAD* state 21:27 another way to handle detached state 21:36 put a new branch label 22:30 git stash

[@wimdenherder]

😂

[@hshlom]

Who else went through this whole video without ever pausing the video and going back a few seconds to repeat something? Haha, just kidding! I stopped and went back so often, I spent almost 2 hours on this video, because this was a Very Useful Video. Thank you David!

[@DavidMahler]

Ha, I think my videos are a bit dense/compact could be good could be bad :-).

[@anisabdul1799]

This and its earlier videos are extremely well done and useful. Thank you!

[@DavidMahler]

You're welcome! And thank you!

[@annettekusma8850]

Really clear explanations, great visualizations and clean walk through of carefully picked examples, professional sound and screen, no distractions, flawless speech and neutral voice. More of that!!

[@DavidMahler]

Wow, thanks!

[@kakarnyori5457]

One of the best git tutorial on git flow. Thank you!

[@DavidMahler]

Thanks for that, you're welcome!

[@abhishekgovekar5542]

These 3 videos are the best explanation videos for Git so far on KZbin......Great job David!...Thank you!

[@DavidMahler]

Wow, thanks!

[@alfredovitori]

1:00 - Creación de un repositorio 5:04 - Creación de ramas 10:08 - Fusión FFWD 11:54 - Eliminación de ramas 13:30 - Fusión a tres bandas 14:49 - Conflictos de fusión 20:25 - Detached HEAD 22:30 - Stash

[@badbadboy5657]

What more can I ask, if you explained it better than anyone I've seen on KZbin and.. AND.. added all the used commands in the description. You're a blessing.

[@DavidMahler]

Thanks! Glad those were helpful ;-).

[@RalphJulsaint]

This is by far the best git tutorials that I have come across. No other tutorial has explained the Detached HEAD state any better.

[@DavidMahler]

TY!

[@MuraliKrishna-ny2ti]

The three videos on Git gave me a clear understanding of Git. Out of all other sources I had looked for (including Coursera courses), this is the best. Thanks David.

[@DavidMahler]

great, and it's free! TY!

[@aminaleali7161]

Communication and presentation is an art. With that said, David's videos are Mona Lisa! Thank you David!

[@DavidMahler]

Wow, thanks for that!

[@yaoluxttu]

Your tutorials are really so helpful, very clear and logical graphics, using git status to show the current state every time, very helpful!

[@DavidMahler]

Thank you!

[@mistymornings]

You’re a gifted teacher. Hands down the greatest git explainer.

[@DavidMahler]

Very kind, thank you!!!

[@victor_zsasz]

just brilliant!! thanks david

[@DavidMahler]

Thank you Aaradhya!!!

[@varshamohite8238]

A very unique way you have explained everything. Direct encountered point to point. appreciate your work David. Thank you !!

[@DavidMahler]

Awesome, thanks!

[@GotUpLateWithMoon]

this series is the best material on git than any conference talks on KZbin. Thank you very much David!

[@DavidMahler]

You're very welcome!

[@udararanasinghe6670]

This is a well documented tutorial.. step-by-step. No confusions what so ever. Thank you.

[@DavidMahler]

Thanks!

[@britzkopf]

An explainer video done well... who would have guessed such a thing could be found on youtube??? Well done!

[@DavidMahler]

Ha, thanks a lot Owen!

[@KarthikOrugonda]

I became a fan of your explanation. Really great way to explain concepts practically and diagrammatically, loved it a lot. Had watched several videos but nothing gave me a clear-cut idea like your illustration did.

[@DavidMahler]

Awesome, thanks for the feedback Karthik. I've had trouble with Git when I first was trying to learn it. I tried to present in a way I felt would have helped me when I started.

[@dfvdfxdfgvdfb4257]

Literally the BEST git tutorial out there and I've watched dozens.

[@DavidMahler]

TY!

[@lingamtata]

phenomenal, this video is most precise and fast way of understanding concept. One of the best for Git branching , which is normally confusing to understand but you rock and you made it so simple. you conveyed the concept in just 28 min . Really creative and more precise. Thank you David

[@DavidMahler]

You are quite welcome, thanks for the detailed feedback!

[@romanschayuk5494]

Very good continuation of previous "Core Concepts" video. This video makes you understand git branching and merging. Clearly, nicely explained on simple examples with simple slides. Exactly what I need. Thank you, David for great tutorials!

[@DavidMahler]

Thanks Roman!

[@kasiviswanathan5431]

Great work! Nicely done.

[@DavidMahler]

TY!

[@manishn6362]

This is a great presentation. I am grateful David. Keep adding more videos on git, artifactory, jenkins, uDeploy etc if possible. Thank you so very much.

[@DavidMahler]

OK thanks!

[@rajeevjasti4320]

Awesome explanation ... Every time I read and watch stuff about git I end up with so many questions. But you cleared all my doubts in 30 minutes and now I am so confident in using git. Thank you so much

[@DavidMahler]

Awesome, that is great to hear, thank you!

[@subhasisjoshi8135]

Best playlist of git tutorial.Learned a lot . Clear explanation and simple graphic illustration. Thank you David

[@DavidMahler]

Wow, thanks!

[@evilspoons]

Excellent, I've been meaning to figure out how to use Git after being stuck on SVN for ages. This is super straightforward.

[@DavidMahler]

nice, thanks! I never learned SVN.

[@brijaggarwal8771]

highly comprehensive explanation and illustration, best I have seen on the topic so far...thank you!

[@DavidMahler]

yw!!!

[@TheKLGamer]

This is THE BEST GIT TUTORIAL on the ENTIRE web. And let's also apreciate the fact that is free guys.

[@DavidMahler]

yes let's! ;-)

[@bareminimum-mrtz]

These videos are very underrated , best video for learning git...

[@DavidMahler]

Thank you!

[@mafazabrar4349]

This is the best explanation on KZbin

[@DavidMahler]

Thanks Mafaz!

[@jeremielachkar4229]

Excellent and precise explainations, that make this video the easiest understandable tuto I found on the internet about git so far

[@DavidMahler]

Awesome, thanks for the comment!

[@solsav]

Single handedly the best git intro tutorial... I've been suggesting another video to students all this time and one of them just sent me this. Precise and to the point, easy to understand and simply what a tutorial should be.

[@DavidMahler]

Oh that's great, say thanks to the student for me ;-). Thanks!

[@tarrakis]

After a confusing 4.5 hour course on Udemy, I finally understood it all thanks to you. Cheers!

[@DavidMahler]

Thanks again!

[@abdelrahmanabdelatief8375]

I always struggled in learning git and I just got to learn the basics and without fully understanding them, this video helped a lot with expanding my knowledge and also in a fun, interesting way, gonna watch all the three video tutorials for git, awesome work man keep it up, I know this is an old video but also gold

[@DavidMahler]

Thanks for the detailed comment, it means a lot!

[@abdelrahmanabdelatief8375]

@@DavidMahler anytime

[@kethavathsurender2089]

One of the best videos on branching and merging in git. Kudos to u for making this video

[@DavidMahler]

TY again!!!!

[@kreativevideos786]

Excellent explanation provided for GIt. Please make more videos for topics like Docker,Jenkins etc. you teach really well.

[@DavidMahler]

I would definitely like to cover topics like that!

[@sitonmypillow]

Thank you so much. I'm a tech writer that has never been a programmer trying to translate this stuff to a busy client. This and your core concepts video were lifesavers!

[@DavidMahler]

Thats great I'm glad it was useful for your work!

[@shaunypie99]

Very clear explanation on a super-dry subject! The simple graphics and text highlighting worked really well, thanks for putting in the time to make this video.

[@DavidMahler]

TY!

[@nneddenn6207]

David, excellent explanations. Crisp, short, easy to understand. You have done it really good)

[@DavidMahler]

Thank you!

[@Bit_By_Byte]

Amazing videos on GIT. Lucid explanation of every concepts in detail. Thanks a lot!

[@DavidMahler]

Glad you like them!

[@sandralloyd3754]

David, This video is fantastic, and ended my search for a lot of information. The content was well-thought out, and your cadence and intonation are perfect and friendly. Because of that, when I slowed the video down to 0.75 speed, it was the perfect video! I absorbed so much. Thank you! I will be looking out for more of your videos!

[@DavidMahler]

Thanks! Yes some folks have said the videos move a little fast, it's hard to find just the right balance.

[@radio555]

I've been using git (mostly poorly) for a decade and I learned a lot from this video!

[@DavidMahler]

We probably all do (use it mostly poorly) ha!

[@kelvinotieno4381]

This is a really great tutorial for someone who has the basics and just wants to start learning some advanced concepts.

[@DavidMahler]

Thanks for the comment!

[@dnihalanis]

very cool... explained in a subtle way step by step to common scenarios.

[@DavidMahler]

Thanks!

[@RahulKumar-fc8cf]

This is THE BEST Git tutorial. Wonderful work!

[@DavidMahler]

Glad it was helpful!

[@curious_science_guy]

Excellent video. Finally found a video that explains what I have been missing even after watching countless others. Going to dive in and watch the rest of your videos. Many thanks.

[@DavidMahler]

Awesome, thanks for that Paul!

[@leo-rq2ei]

This is by far the best lecture on git I’ve seen

[@DavidMahler]

Thanks Leo!

[@mitravindgarg5372]

Kudos David for making such an excellent video with graphic explaiation. I have immediately subscribed ! Gr8 Work

[@DavidMahler]

Awesome, thanks for subscribing!

[@koustubhkulkarni8849]

Explained with simple words and examples ..! Resolved the mystery of detached HEAD

[@DavidMahler]

Thanks I know, it was so weird to me at first!

[@ashishghodake8653]

Made the most dreaded topics in git look like a piece of cake!!! Loved your simple and to the point explanation!!

[@DavidMahler]

Thanks!

[@saurabhband6948]

Finally, what I was looking for, cleared a lot of concepts like, various merging and stashing. Great work. I have been using git for some time now for my project, but my knowledge was limited to push, pull, and creating a branch., but this video gave really good insights. A complete git guide for beginners.

[@DavidMahler]

Great, that's how I started with git too, I didn't really know what I was doing at all!

[@venugopaln821]

probably one of the best Git tutorial out there with a very crisp and to the point explanation. Thank you, this really helped out a lot !!

[@DavidMahler]

Great to hear!

[@xelaksal6690]

The best explanation, step by step. Git now is so simple

[@DavidMahler]

Thanks for continuing to support the channel!

[@koseavase]

David your explanation is simply amazing!!!

[@DavidMahler]

ty!

[@dineshjothiram3677]

Excellent Explanation.Easy to understand the core concept of branching and merging.

[@DavidMahler]

Thanks!

[@Alex-xe6bl]

Felt like a github master after watching this series ♥

[@DavidMahler]

TY!

[@ogreeni]

This was very helpful and extremely well made. Thanks, David!

[@DavidMahler]

Thank you 63dogs!!!

[@royalkamran]

you are a professional speaker, love your explanation

[@DavidMahler]

Thank you! 😃

[@oldyoutubevideos7430]

Loved this

[@DavidMahler]

ty!

[@OmriGrin]

Thanks a lot! I started working recently in a company that manufacture chips for routers and I just got a merge conflict. This video really helped me understand how the conflicts works and how to resolve it correctly. I am using beyond compare and at first I didn't understand why I had 3 different text files to compare, this video explains it perfectly. Again, looking forward for the next one on remotes!

[@DavidMahler]

Thanks, Omri! I haven't used beyond compare, I'll look at it for my own interest. Yes, the three way merge I never really paid attention to when first using Git, and that was to my detriment in learning about merges - so I put some attention to it here.

[@onemanenclave]

It's not fast at all! The speed is perfect and the explanations are very clear! Some people simply need to be reminded they can replay the parts they didn't get the first time as many times as they want ¬_¬

[@DavidMahler]

Thanks, it's hard to find a happy medium!

[@victorlongshanks477]

What a concise explanation for Beginners. Great work

[@DavidMahler]

TY!

[@fresco2501]

Excellent content. It helped me to grasp a bit of Git. I also watched Introduction to Git - Core Concepts, which in fact is needed here.

[@DavidMahler]

TY!