Git Branching and Merging - Detailed Tutorial

  Переглядів 170,994

SuperSimpleDev

SuperSimpleDev

День тому

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...
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

КОМЕНТАРІ: 314
@hari48907
@hari48907 6 місяців тому
please don't skip ads...he is working really hard to make us understand
@Juanfu224
@Juanfu224 Місяць тому
I have adblocker but i put mi like and comment to help to the algoritm
@paragggoyal1552
@paragggoyal1552 Місяць тому
but i am a premium member
@oualidelmernissi2315
@oualidelmernissi2315 Місяць тому
@@paragggoyal1552 I Think if you are premium they get a cut directly -- > So no worries for that :)
@lightningknight1090
@lightningknight1090 4 дні тому
But the creator turned off the ads
@BamItsHazel
@BamItsHazel 3 місяці тому
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!
@jkaryskycoo
@jkaryskycoo 7 місяців тому
I like your style. No flash, no pizzazz. Subscribed.
@batchrocketproject4720
@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
@SuperSimpleDev 2 роки тому
Thanks for watching! 😀 most of the time with Git, it's better to keep it simple
@an0n_amr
@an0n_amr 9 місяців тому
@@SuperSimpleDev Thank you for those 3 simple Git explanation videos. literally from zero to hero
@buzzht
@buzzht Рік тому
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
@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!
@santiagoaristi2808
@santiagoaristi2808 Рік тому
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!
@cooper24
@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
@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
@slatercolt
@slatercolt 2 місяці тому
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!
@zKiid
@zKiid Рік тому
By far the best teacher I've watched on UKposts. Thank you Simon.
@josejaimefelixgarciagarcia8884
@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.
@tau9632
@tau9632 Рік тому
I wish I could super-like this video.. so clear and concise, with amazing visual aids and examples - perfect!
@treequin
@treequin 11 місяців тому
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).
@uzochukwu1556
@uzochukwu1556 3 місяці тому
Coming across your channel was one of the best things that happened to me on UKposts. 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.
@ahmedoutalebna9270
@ahmedoutalebna9270 7 місяців тому
this is one of the best tuto in branching and merging in youtube, great work
@ParleysWoodedJourney
@ParleysWoodedJourney Рік тому
This Git series is awesome. Now to do some practicing. Thank you so much. I'm sharing this with my team.
@polikaify
@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.
@VishalKanwar-nv3po
@VishalKanwar-nv3po 6 місяців тому
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. ♥
@aleksandar7463
@aleksandar7463 Рік тому
Great course! Extremely valuable input for someone who is about to start working in collaboration with other developers.
@shreyasnair7949
@shreyasnair7949 Рік тому
This is the best tutorial for branches Available on UKposts
@ukpkmkk8409
@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!!!!
@betrandndah6862
@betrandndah6862 2 роки тому
This is the best Git tutorial I have ever watch. Good job mate
@LittleVidds
@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!
@shohruhrustamov3449
@shohruhrustamov3449 3 місяці тому
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
@rahultino
@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
@SuperSimpleDev 2 роки тому
Thanks for watching! I'm happy you're able to understand the explanations!
@Superswallow
@Superswallow Рік тому
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
@SuperSimpleDev Рік тому
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
@bombdotcomist
@bombdotcomist Рік тому
CS student at Illinois here, exceptional tutorial man. Better than anything showed in class. Thumbs upped for sure.
@fadygamilmahrousmasoud5863
@fadygamilmahrousmasoud5863 4 місяці тому
I think this is the best video talking about branching and how to work daily using Git, Thanks man.
@user-vf8jr2yf7y
@user-vf8jr2yf7y 8 місяців тому
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.
@valdenicio22
@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++.
@johnvela1508
@johnvela1508 Рік тому
This course was amazing, thanks for everything!!!
@user-wf9el1lt1o
@user-wf9el1lt1o 7 місяців тому
This is such a detailed, helpful, and easy-to-understand video teaching git. Love it! Thanks so much!
@lakshya209
@lakshya209 10 місяців тому
Wow, seriously thank you for taking out so much time for this. God bless you!
@ranjeetnbittu
@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 👍👍
@user-th1zt8ed1z
@user-th1zt8ed1z 6 місяців тому
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!!!
@rahulsaxena392
@rahulsaxena392 2 місяці тому
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.
@ragavs1709
@ragavs1709 4 місяці тому
Got a real time organization experience!!! Thanks a ton
@fredca7178
@fredca7178 3 місяці тому
This course was absolutely increadible. Thank you very much
@israelnoah18
@israelnoah18 Рік тому
Looking forward for more well explained videos on git, github and other software technologies such as this,Thanks
@Tech-ub8dd
@Tech-ub8dd 10 місяців тому
Thank you for this tutorial, its very professional , very clean and easy to follow!
@bishalgiri3646
@bishalgiri3646 2 роки тому
you made it crystal clear. Thank you so much no one made it this simple to understand 😊
@SuperSimpleDev
@SuperSimpleDev 2 роки тому
Thanks for watching 😄
@franciskhoury4288
@franciskhoury4288 11 місяців тому
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!
@kumarmahendra2611
@kumarmahendra2611 Рік тому
Thank you for creating this series..!
@yureshmajhi5208
@yureshmajhi5208 Рік тому
If you had never made this video, I would have never learned git or github. Best tutorial on youtube.
@movsesaghabekyan9794
@movsesaghabekyan9794 5 місяців тому
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 :)
@Vignesh-ho2dn
@Vignesh-ho2dn 6 місяців тому
Thank you for such an elaborate video. It helped a lot!
@just_julia_things
@just_julia_things 7 місяців тому
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!!
@chandru7651
@chandru7651 2 роки тому
Explained exactly how any one can imagine when learning this branching and merging concepts..thanks for your work...
@SuperSimpleDev
@SuperSimpleDev 2 роки тому
Thanks for watching 😀
@swapnilshingote8773
@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
@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)
@abderrahmenekasmi2024
@abderrahmenekasmi2024 5 місяців тому
Thank you for this amazing course
@faroukbello164
@faroukbello164 Рік тому
You are the real MVP, thank you very much. We hope to see more amazing content in 2023.
@yusufrahimov9160
@yusufrahimov9160 Рік тому
This tutorial is a great resource for learning about programming. Thanks
@VaurionX
@VaurionX 5 місяців тому
Another great tutorial. Your explanations are so clear.
@SamiUllah-sh9rb
@SamiUllah-sh9rb 7 місяців тому
I have never seen such great tutorial about git branching. Loved it❤🎉🎉
@lakshman587
@lakshman587 Рік тому
This was the exact video I was searching for!! Thank you so much!!!!
@mrashad_com
@mrashad_com Рік тому
I am very appreciative of this tutorial video; it has been immensely helpful.
@ahlambeyoud1709
@ahlambeyoud1709 7 місяців тому
No one ever explained git like you the best video on UKposts. million thanks to you 💖
@ConnyTangring
@ConnyTangring 2 місяці тому
Excellent tutorial! Great work. Thanks.
@sorinica
@sorinica 6 місяців тому
Thank you for the tutorial!
@nivena
@nivena 9 місяців тому
Awesome, the three part tutorial has helped a lot
@judithukachukwu6434
@judithukachukwu6434 Рік тому
You are great teacher, I understood every bit of what you said. Thank you so much. Best video I ever watched
@InglesConConfianza
@InglesConConfianza 8 місяців тому
FANTASTIC Tutorial
@weixintoo5939
@weixintoo5939 3 місяці тому
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 =)
@user-lx3hx8qb7q
@user-lx3hx8qb7q 9 місяців тому
AMAZING TUTORIAL
@lakshman587
@lakshman587 Рік тому
Thank you soooooo much!!! I clearly understood the complete video!!!! Million billion trillion thanks to you!!!!!
@kurkov11
@kurkov11 3 місяці тому
Such a great explanation. Thank you.
@stephikebudu
@stephikebudu 5 місяців тому
Very detailed info! Thank you!
@electric-lemonade
@electric-lemonade 11 місяців тому
Thanks a lot, this was super helpful !
@zOldDude
@zOldDude Рік тому
Sincere thanks are in order. This is valuable content.
@marcdkun19
@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
@SuperSimpleDev 2 роки тому
I’m glad it was helpful 😄 thanks for watching
@favournwachukwu9211
@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
@SuperSimpleDev 2 роки тому
Great to hear Favour! Thanks!
@shantkumarbiradar9255
@shantkumarbiradar9255 9 місяців тому
Just here to say, 'Thank you and much appreciated'!! You know how to explain concepts.
@edenng8431
@edenng8431 3 місяці тому
I am very new to git and github. Thank you so much for the great content. It is very helpful!!!
@Hunkeykung
@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
@SuperSimpleDev Рік тому
Thanks for watching! I appreciate your support!
@ikelejiemmanuel655
@ikelejiemmanuel655 18 днів тому
This is so cool. Thanks Simon and bring more
@zari_723
@zari_723 9 місяців тому
thank you for all 3 videos, you have great teaching skills and you explain everything perfectly 👌
@juliealmer6383
@juliealmer6383 3 місяці тому
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
@SuperSimpleDev 3 місяці тому
Thanks for watching! I'm happy you found it helpful
@purplesky135
@purplesky135 5 місяців тому
thank you so much seriously, I appreciate people like you a lot
@vector-wf7ly
@vector-wf7ly 5 місяців тому
Thank you. It is easy to understand. Your teaching skill is great.
@nanakomastu4354
@nanakomastu4354 5 місяців тому
Thank you for giving such a good class...
@ENC77
@ENC77 6 місяців тому
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!
@todorowael
@todorowael Рік тому
Great tutorial, thank you!
@Tracker_P
@Tracker_P Місяць тому
Gem of a tutorial, thank you so much
@merjentoylyyewa9438
@merjentoylyyewa9438 4 місяці тому
Very simple and detailed explanation saved my day❤
@Thesadsadgame
@Thesadsadgame 2 роки тому
Incredible tutorial! Love your style.
@SuperSimpleDev
@SuperSimpleDev 2 роки тому
Glad you like it!
@user-td3gf7iq1z
@user-td3gf7iq1z Місяць тому
Thank you for your work.
@tundemikail5678
@tundemikail5678 2 роки тому
I just subscribed to your channel. You made git branching & merging so simple, so i want to say thank you and keep up the good work.
@SuperSimpleDev
@SuperSimpleDev 2 роки тому
Thanks for watching! I’m glad it’s easy to understand 😄
@universal4334
@universal4334 5 місяців тому
This is really real stuff. This is what a software engineer does in daily life. Appreciate his work 👏 🙌
@sashunkjs
@sashunkjs 2 роки тому
Extremely good thank you. Very practical. Super organized.
@SuperSimpleDev
@SuperSimpleDev 2 роки тому
Thanks for watching!
@yakuzaCrub
@yakuzaCrub 9 місяців тому
The easiest git branching explanation !
@JoaoMachado55
@JoaoMachado55 2 роки тому
Excellent, git branches merge finally makes sense to me. Nicely done
@SuperSimpleDev
@SuperSimpleDev 2 роки тому
Great! 😄 I’m happy it makes sense
@aljumailimustafa1059
@aljumailimustafa1059 6 місяців тому
This is what everyone might need .. thanks
@robertlee9761
@robertlee9761 Рік тому
That is a fantastic tutorial, thank you.
@tandapnoelbansikah6280
@tandapnoelbansikah6280 8 місяців тому
Thank you sir Simon that was great
@sumingyu1527
@sumingyu1527 2 роки тому
Thank you!!! Well explained and useful
@upendra4339
@upendra4339 Рік тому
Very helpful video. Many thanks!!
@koribr764
@koribr764 Рік тому
Thank you. I wish you had many more videos
@od2437
@od2437 Рік тому
Thank you! I came here for the conflict explanation
@rameshemv
@rameshemv 2 роки тому
Great Video, thanks for the "guided" tutorial
@kunalkittur4608
@kunalkittur4608 Рік тому
Thank you for the tutorial.. I'm just starting my coding journey and this video has been a great stepping stone!
Git and GitHub - 0 Experience to Professional in 1 Tutorial (Part 1)
36:57
SuperSimpleDev
Переглядів 340 тис.
Branching Strategies Explained
18:19
DevOps Toolkit
Переглядів 122 тис.
Kitten has a slime in her diaper?! 🙀 #cat #kitten #cute
00:28
"Поховали поруч": у Луцьку попрощались із ДВОМА Героями 🕯🥀 #герої #втрати
00:15
Телеканал Конкурент TV - новини Луцька та Волині
Переглядів 86 тис.
GADGETS VS HACKS || Random Useful Tools For your child #hacks #gadgets
00:35
Зомби Апокалипсис  часть 1 🤯#shorts
00:29
INNA SERG
Переглядів 1,1 млн
Git MERGE vs REBASE: The Definitive Guide
9:39
The Modern Coder
Переглядів 45 тис.
Learn Git Rebase in 6 minutes // explained with live animations!
6:43
The Modern Coder
Переглядів 746 тис.
Git Tutorial for Beginners: Learn Git in 1 Hour
1:09:13
Programming with Mosh
Переглядів 2,2 млн
Git MERGE vs REBASE
16:12
Academind
Переглядів 1 млн
So You Think You Know Git - FOSDEM 2024
47:00
GitButler
Переглядів 879 тис.
Complete GIT in 1 video
3:43:17
Hitesh Choudhary
Переглядів 37 тис.
Getting started with branching workflows, Git Flow and GitHub Flow
10:30
Nick Chapsas
Переглядів 133 тис.
Wordpress vs coding - why devs SHOULD learn Wordpress
11:03
SuperSimpleDev
Переглядів 267 тис.
Git For Beginners 2023
2:00:37
Telusko
Переглядів 166 тис.
Kitten has a slime in her diaper?! 🙀 #cat #kitten #cute
00:28