Git Branching and Merging - Detailed Tutorial

Рет қаралды 186,983

Күн бұрын

Learn Git branching and merging and use it with GitHub in the feature branch workflow. Branching and merging are powerful features of Git and GitHub that allows teams to work simultaneously in a project. Once you learn branching and merging, you'll be at a professional level of Git and GitHub.
Part 1 of this Git and GitHub tutorial:
• Git and GitHub - 0 Exp...
Part 2 of this Git and GitHub tutorial:
• Git and GitHub - 0 Exp...
Git and GitHub cheatsheet:
supersimple.dev/courses/git-g...
Premium Courses:
🎓 Get a certificate for our courses with premium learning experience & support SuperSimpleDev! ❤️
HTML CSS Premium Course: courses.supersimple.dev/cours...
JavaScript Premium Course: courses.supersimple.dev/cours...
0:00 Branching
1:42 Branching example
11:31 Merging
19:23 Merge conflicts
27:26 Feature branch workflow
37:51 Update local repository after merge
40:27 Merge conflicts in feature branch workflow
48:52 Resolve merge conflicts on our computer
Contact: supersimple.dev/feedback
Behind the scenes: / supersimple.dev
Latest updates: / supersimpledev
#git
#github
#gittutorial
#learntocode
#codingtutorial
#webdeveloper

Пікірлер: 340

@vk19148 8 ай бұрын

please don't skip ads...he is working really hard to make us understand

@Juanfu224 3 ай бұрын

I have adblocker but i put mi like and comment to help to the algoritm

@paragggoyal1552 2 ай бұрын

but i am a premium member

@oualidelmernissi2315 2 ай бұрын

@@paragggoyal1552 I Think if you are premium they get a cut directly -- > So no worries for that :)

@lightningknight1090 Ай бұрын

But the creator turned off the ads

@DheaFadlia 20 күн бұрын

I don't, I use youtube premium 😅

@BamItsHazel 5 ай бұрын

Amazing 3 part tutorial. Simple enough for anyone to understand, really broke down a seemingly complex subject. Thank you for saving my university life. And props to myself for self-learning, and to anyone else that reads this comment too!

@cooper24 2 жыл бұрын

Thank you! I'm a solo developer and I was having a hard time coming up with a solid workflow. Your video really helped me figure out what I want to do.

@SuperSimpleDev 2 жыл бұрын

I'm happy it helps! Usually I create a branch and merge it in even when I'm working alone since it gets me into the habit, and also it's easier to review my code using the Pull Request process on GitHub

@batchrocketproject4720 2 жыл бұрын

Thank you for taking the time to do such a thorough job. This is gold dust to those of us who work on our own and only really need to use basic branching. It is refreshing to have someone who clearly routinely works in a team explain how developers manage different streams. I wish your channel all the success it deserves.

@SuperSimpleDev 2 жыл бұрын

Thanks for watching! 😀 most of the time with Git, it's better to keep it simple

@an0n_amr 11 ай бұрын

@@SuperSimpleDev Thank you for those 3 simple Git explanation videos. literally from zero to hero

@buzzht 2 жыл бұрын

I have followed all 3 videos in this series and it's been a great learning experience. The pace, the examples, the explanations everything is just perfect. Would definitely recommend to all my colleagues. Thank you so much.

@longnhat6405 Жыл бұрын

You are a lifesaver! Your HTML CSS course is amazing, and you also made an incredible video! Keep going our community needs people like you. I really appreciate that!

@ahmedoutalebna9270 9 ай бұрын

this is one of the best tuto in branching and merging in youtube, great work

@santiagoaristi2808 2 жыл бұрын

Really enjoyed learning with this tutorial! I feel like I have a better grasp on git and github. The explanations on merging and branching really were explained in simple terms where someone that is new to tech can understand. Thanks for this video!

@slatercolt 4 ай бұрын

DUDE! Thank you, I just finished your 10 video playlist as of this video and I intend to watch the rest of the videos that you have uploaded! Super grateful for these, I'm already a software engineer but this is improving my engineering literacy and competence so much!

@VishalKanwar-nv3po 7 ай бұрын

It was Absolutely AMAZING. Exactly the stuff I was looking for. I was tired of only the basic intro to git videos. You did an awesome job explaining the team workflow and how it should be used. ♥

@uzochukwu1556 5 ай бұрын

Coming across your channel was one of the best things that happened to me on KZfaq. I've learned from your HTML and CSS video, your JavaScript videos, and then this. I am working on a project with my friend and my knowledge of Git was murky, but because of how well you explained everything in this 3 part course, I clearly understand how to use GitHub. Thank you for this, you're truly making a tech career possible for anyone.

@treequin Жыл бұрын

Thank you again for making these tutorials. I'm an aspiring programmer and after watching the three videos, I feel like I have a solid base to use both Git and GitHub (which baffled me so much before).

@zKiid Жыл бұрын

By far the best teacher I've watched on KZfaq. Thank you Simon.

@tau9632 2 жыл бұрын

I wish I could super-like this video.. so clear and concise, with amazing visual aids and examples - perfect!

@user-vf8jr2yf7y 10 ай бұрын

You are one of the reasons which made me confident that, I can program like a pro and things that seem complicated aren't hard, just a good teacher can make it look easy.

@Superswallow 2 жыл бұрын

Best tutorial ever. Very easy to follow from start to finish. I had zero knowledge on git but now im confident with the syntax and workflow of how to use git. My internship coming up and I can’t wait to apply on a real project. Looking forward to more tutorials. I’m truly grateful and indebted to you. You deserve 1M subs!

@SuperSimpleDev 2 жыл бұрын

Thanks for watching! That's awesome, hopefully when you start using it on the job, it will be a lot easier to see how and why git is used

@rahultino 2 жыл бұрын

This is one of the simplest and best explained git tutorial I have come across. You keep things simple. You walk through simple scenarios and then build up to more complex scenarios. Very well done.

@SuperSimpleDev 2 жыл бұрын

Thanks for watching! I'm happy you're able to understand the explanations!

@shohruhrustamov3449 5 ай бұрын

thanksssss, simon, i saw so many git tutorials, but this one is the best, i spent 3 months(i know it is too long) to understand how git works and had no success, but you explained it in 3 videos, thank you very much

@movsesaghabekyan9794 7 ай бұрын

Thank you very much it helped me a lot but I want to mention that its generally recommended to resolve conflicts on the branch where the changes were introduced to keep a cleaner and more organized history. Wish you all luck who reading this :)

@angsh Ай бұрын

Clean! Accurate. Thanks for being so clear and clutter less. Brilliant guide.

@valdenicio22 2 жыл бұрын

I'm not even a native English speaker but the way that you explain everything is easy to understand. Also, that work experience that you've been adding to the videos, really adds a lot of value. Thanks for sharing that. Subscribed++.

@user-wf9el1lt1o 9 ай бұрын

This is such a detailed, helpful, and easy-to-understand video teaching git. Love it! Thanks so much!

@polikaify Жыл бұрын

Thank you so much! I am very new to coding (let alone Git and Github) and trying to set up the system to link between files on my PC to the Github. I was searching around, reading through probably more than 20 sources in the timespan of days. None really worked for me. Your video is the answer! I really appreciate your help and sharing the knowledge. Please continue the great works, we need you.

@user-th1zt8ed1z 8 ай бұрын

I've watched all 3 parts and I reaaally learned a lot. As a freshman in university majoring in computer science, your courses taught me what I won't learn from the university classes. It's well-organized and I have no problem with your clear English even though I'm not good at English. Thank you!!!

@shreyasnair7949 Жыл бұрын

This is the best tutorial for branches Available on KZfaq

@just_julia_things 9 ай бұрын

This 3-part video was such a thorough tutorial, you don't know how happy & excited I felt after finishing it & getting to apply it to my project. I know you made this two years ago, but I want to let you know that even now, you're still able to help aspiring devs learn through your videos. I've been gushing about you and your channel to my friends recently HAHAHA. I hope you and your channel gets the success it deserves!!

@josejaimefelixgarciagarcia8884 Жыл бұрын

Finally found a video that explains the conflicts. The examples are great. I hope you can teach us what happens when it has conflicts in multiple files.

@bombdotcomist Жыл бұрын

CS student at Illinois here, exceptional tutorial man. Better than anything showed in class. Thumbs upped for sure.

@ParleysWoodedJourney Жыл бұрын

This Git series is awesome. Now to do some practicing. Thank you so much. I'm sharing this with my team.

@swapnilshingote8773 2 жыл бұрын

Thank you sir...I have watched your all 3 part series on Git and I dont think anyone would have been able to explain minutely the way you did it...Thanks I am feeling more confident now on using Git and also to face interview questions , before this I used to mug up the commands but didn't knew the actual background of it..

@SuperSimpleDev 2 жыл бұрын

Thanks for watching 😀 yup all the git commands we use serve a purpose and once we understand that it’s much easier to know what to do. That’s interesting, I actually haven’t encountered Git questions in an interview though (other than they ask me to download a project repo from git to work on)

@betrandndah6862 2 жыл бұрын

This is the best Git tutorial I have ever watch. Good job mate

@harrisonliang326 10 ай бұрын

This was the best Git and Github tutorial I've ever watched. I went through all 3 parts and did every example. I now have a much better understanding of how everything works. Liked and subscribed😎 Thank you so much!

@SuperSimpleDev 10 ай бұрын

Thanks for your nice comment! I am glad that it helped! :)

@franciskhoury4288 Жыл бұрын

SuperSimpleDev and @IAmTimCorey are saving my sanity. After years of being the "IT guy who doesn't understand the fundamentals behind the stuff he works with", I have been making a effort to educate myself in my spare time to begin cracking open the black boxes I work with day after day. I have mapped a course of learning as suggested by Tim in one of his videos, and so far, I have been very pleased with the SuperSimpleDev courses I have completed...starting with HTML5/CSS3 and now Git Fundamentals. The latter has already made a big difference in my ability to complete a project. Thank you, SSD; you are an excellent teacher!

@aleksandar7463 Жыл бұрын

Great course! Extremely valuable input for someone who is about to start working in collaboration with other developers.

@fadygamilmahrousmasoud5863 5 ай бұрын

I think this is the best video talking about branching and how to work daily using Git, Thanks man.

@favournwachukwu9211 2 жыл бұрын

Hello, as a younger developer from London your videos on HTML and css and GIT has so priceless to me and i wanted to say a big thank You.

@SuperSimpleDev 2 жыл бұрын

Great to hear Favour! Thanks!

@ENC77 8 ай бұрын

Simon am such a slow leaner and am doing a career change at 46 doing full stack and l must say l almost quit until l watched your JavaScript tutorial! Now am confident l will master my program! You are such an amazing tutor and when you explain it's as if you were part of the JS and Git team when they came up with these programs! l guess all am trying to say is thank you!

@ukpkmkk8409 Жыл бұрын

Really appreaciate what u have done for those vids, i have watched all the git tutorial that u have posted, i gotta say that they help me alot, thank u again from the bottom of my heart!!!!

@johnvela1508 Жыл бұрын

This course was amazing, thanks for everything!!!

@ragavs1709 6 ай бұрын

Got a real time organization experience!!! Thanks a ton

@lakshya209 11 ай бұрын

Wow, seriously thank you for taking out so much time for this. God bless you!

@fredca7178 5 ай бұрын

This course was absolutely increadible. Thank you very much

@ikelejiemmanuel655 2 ай бұрын

This is so cool. Thanks Simon and bring more

@bishalgiri3646 2 жыл бұрын

you made it crystal clear. Thank you so much no one made it this simple to understand 😊

@SuperSimpleDev 2 жыл бұрын

Thanks for watching 😄

@keyvanpfannenschmidt Ай бұрын

Thanks mate thats an amazing tutorial. This made me less afraid of using branches. It was clear, precise and had the right pacing. keep it up!

@rahulsaxena392 4 ай бұрын

Very crisp and clear explanation of Git from scratch. Thanks a ton . Need more videos on other topics please like CI/CD Jenkins , Microservice etc.

@LittleVidds Жыл бұрын

Just finished all three Git and Github videos! Loved your teaching method, would definitely appreciate a course or video about testing :). Thanks for this helpful course!

@juliealmer6383 5 ай бұрын

You are amazing! I went through all 3 videos and I went from being clueless on the command line and wanting to download/use VS Code to fully understanding. Now I just need more practice. Thank you so much for your clear and concise videos and please keep it up! I can't wait to learn more from your videos.

@SuperSimpleDev 5 ай бұрын

Thanks for watching! I'm happy you found it helpful

@ranjeetnbittu Жыл бұрын

Great tutorial - very crisp and clear explanation with simple and relevant examples. Thank you so much for creating this tutorials. Keep giving your knowledge back to the society. Thanks 👍👍

@lakshman587 Жыл бұрын

This was the exact video I was searching for!! Thank you so much!!!!

@SamiUllah-sh9rb 8 ай бұрын

I have never seen such great tutorial about git branching. Loved it❤🎉🎉

@ahlambeyoud1709 8 ай бұрын

No one ever explained git like you the best video on KZfaq. million thanks to you 💖

@InglesConConfianza 9 ай бұрын

FANTASTIC Tutorial

@stephikebudu 7 ай бұрын

Very detailed info! Thank you!

@israelnoah18 Жыл бұрын

Looking forward for more well explained videos on git, github and other software technologies such as this,Thanks

@ConnyTangring 4 ай бұрын

Excellent tutorial! Great work. Thanks.

@Hunkeykung Жыл бұрын

Damn you are a natural teacher. Thank you. The teachers at my coding bootcamp should take notice. I felt so dumb not understanding this and you explain it so well. Apparently I made it way more complicated in my head.

@SuperSimpleDev Жыл бұрын

Thanks for watching! I appreciate your support!

@yureshmajhi5208 Жыл бұрын

If you had never made this video, I would have never learned git or github. Best tutorial on youtube.

@chandru7651 2 жыл бұрын

Explained exactly how any one can imagine when learning this branching and merging concepts..thanks for your work...

@SuperSimpleDev 2 жыл бұрын

Thanks for watching 😀

@lakshman587 Жыл бұрын

Thank you soooooo much!!! I clearly understood the complete video!!!! Million billion trillion thanks to you!!!!!

@Mohith7548 Ай бұрын

Note always use this command to delete "git branch -d " instead of "-D" because "-d" will warn you id there are any uncommited changes, where as "-D" will directly delete which is a big loss if you have any uncommited changes.

@arunv8338 5 ай бұрын

Normally i did give any comments... But this guy break my rules and pull my finger to type this ... This is absolutely amazing video.. its completely feel like Master level about branching and merging 💫💯

@kumarmahendra2611 Жыл бұрын

Thank you for creating this series..!

@faroukbello164 Жыл бұрын

You are the real MVP, thank you very much. We hope to see more amazing content in 2023.

@abderrahmenekasmi2024 7 ай бұрын

Thank you for this amazing course

@VaurionX 6 ай бұрын

Another great tutorial. Your explanations are so clear.

@weixintoo5939 4 ай бұрын

Hi Simon, thank you very much for your git and GitHub tutorials. Before this, I always felt like git and GitHub were so intimidating, but you made them so easy to understand and I have learned a lot of knowledge from you =)

@marcdkun19 2 жыл бұрын

Thanks. I last used git in 2018. I needed this refresher. This is the part of git that really messes me up. Very clear explanation. Thanks thanks. More topics please.

@SuperSimpleDev 2 жыл бұрын

I’m glad it was helpful 😄 thanks for watching

@uzochukwu1556 5 ай бұрын

Simon, you are truly the goat

@rendellsoberano8784 24 күн бұрын

I've learned so much in 1 hour. Subscribed Thanks!!!!

@Vignesh-ho2dn 8 ай бұрын

Thank you for such an elaborate video. It helped a lot!

@upendra4339 Жыл бұрын

Very helpful video. Many thanks!!

@zOldDude Жыл бұрын

Sincere thanks are in order. This is valuable content.

@jkaryskycoo 9 ай бұрын

I like your style. No flash, no pizzazz. Subscribed.

@robinwebster2754 2 жыл бұрын

Fantasic video Simon! Thanks!👍

@shantkumarbiradar9255 11 ай бұрын

Just here to say, 'Thank you and much appreciated'!! You know how to explain concepts.

@sterling3419 Ай бұрын

That supersimpledev name doesn't lie. Very nice 3 part tutorial

@SuperSimpleDev Ай бұрын

Thanks for watching :) Hope you enjoyed the tutorial.

@Tracker_P 3 ай бұрын

Gem of a tutorial, thank you so much

@Tech-ub8dd Жыл бұрын

Thank you for this tutorial, its very professional , very clean and easy to follow!

@codewithotabek Жыл бұрын

Very nice explanation! Thank you!

@sorinica 8 ай бұрын

Thank you for the tutorial!

@electric-lemonade Жыл бұрын

Thanks a lot, this was super helpful !

@JoaoMachado55 2 жыл бұрын

Excellent, git branches merge finally makes sense to me. Nicely done

@SuperSimpleDev 2 жыл бұрын

Great! 😄 I’m happy it makes sense

@todorowael Жыл бұрын

Great tutorial, thank you!

@Thesadsadgame 2 жыл бұрын

Incredible tutorial! Love your style.

@SuperSimpleDev 2 жыл бұрын

Glad you like it!

@edenng8431 4 ай бұрын

I am very new to git and github. Thank you so much for the great content. It is very helpful!!!

@yusufrahimov9160 Жыл бұрын

This tutorial is a great resource for learning about programming. Thanks

@jellyjollyjelly9513 5 ай бұрын

you are an absolute hero!!!

@kurkov11 5 ай бұрын

Such a great explanation. Thank you.

@user-lx3hx8qb7q 10 ай бұрын

AMAZING TUTORIAL

@nivena 11 ай бұрын

Awesome, the three part tutorial has helped a lot

@user-bc6kt6ei7m 2 күн бұрын

Thank you! I liked the presentation a lot, it's very clear. One little suggestion: When you work on the bottom of the screen, your actual code lines are hidden below the subtitles text.(Of course, you didn't see that when recording.) So just work a bit higher than at the bottom of the screen. Anyway, great work!!