Git & GitHub Tutorial for Beginners #11 - Collaborating on GitHub

Hey gang, in this Git & GitHub tutorial I'll show you how you'd typically collaborate on a team project. Since there's only 1 of me - I'll show you my day-to-day workflow using Git / GitHub in the office within a team.
----- COURSE LINKS:
+ Atom editor - atom.io/a
+ CMDER - cmder.net/
+ GIT - git-scm.com/
---------------------------------------------------------------------------------------------
Related tutorials:
----- NODE.JS TUTORIALS
• Node JS Tutorial for B...
----- SUBSCRIBE TO CHANNEL - / @netninja
============== The Net Ninja =====================
For more front-end development tutorials & to black-belt your coding skills, head over to - / @netninja or thenetninja.co.uk
================== Social Links ==================
Twitter - @TheNetNinja - / thenetninjauk

[@meleecraft]

0:43 The Net Ninja: 'there's just one of me' - you damn right, and we appreciate the quality tutorials you keep pushin

[@pcumamahesh]

Super-simple and elegant explanation. I thought that git branches were too complicated, but now I see it clearly.

[@chukwudaluayika8324]

Your tutorials are by far one of the best I ever came across on here. Clear, straight to the point and very understandable. Love your Channel

[@NetNinja]

Thank you so much :)

[@dreamscapeai7]

You are so awesome at breaking down not so straight-forward concepts. This is the best git tutorial I've seen on KZbin

[@franciscosusana2292]

I just spent my whole afternoon watching your git videos, and they were amazing, they will be very helpful for a project that I'm working on. Thank you for your contribution!

[@anuragshandilya3556]

*me reading this after 11 months after spending my whole afternoon watching his git videos* XD

[@zakariaamehri3465]

@@anuragshandilya3556 me readin this after a week spending my whole afternoon watching his git videos XD

[@melaninrx]

So true. I like how he broke down the videos so you could go right to what you needed.

[@vivekjoshi3769]

How many hours did it take to finish the whole playlist ? It took me almost 4 days to complete this 😅

[@raisama4314]

@@zakariaamehri3465 me reading this after 3 years spending my whole afternoon watching his git videos XD

[@sfk615]

They should rename "Pull Request" to "Merge Request" and make it less confusing. Great videos BTW, clear, concise and to the point. Kudos!

[@conaxliu9677]

I agree. Merge Request makes more sense.

[@CustardCream33]

I don't know how simple things like this were never deemed as necessary by the creators of github lol. I think you'd struggle to find anyone who doesn't think this should be the case...

[@iamdannywyatt]

@Abishek Raju well, but merging branches is what we end up doing when we want to merge a branch with the master (branch), so it would make sense to say Merge Request :) Especially because when you create a pull request, what you are actually doing is a Push Request, because you are asking permission to push (send) your branch and merge it with the master. For example when you are working you use git push origin "branchName" so on GitHub would make sense to also all it a Push or Merge. Pull doesn't make much sense to me either...

[@geebsayshi]

I agree. I swear I struggled nailing down the meaning of pull request at first. It just didn't make sense. It is 2020 and github still don't consider this issue.

[@tulkaz]

Someone should make an extension for chrome that changes the html code on te button xD

[@aasiyamansoori1093]

This totally made me so comfortable with git and github, i was crying on for not able to understand and you helped with this, thank you so much :))

[@david_law]

Short, clear, and closest to my working environment. Best I could find so far. Thank you!

[@cafedelevant7353]

What an amazing tutorial Ninja, Thank you very much! I got the core of git and git hub from your explicit explanation. Always right to the point, without any padding. I would recommend all your courses to literally everyone.

[@NetNinja]

Thank you so much :). Very much appreciated.

[@xcrxwadda8287]

5yrs and it's still helpful, you saved my day

[@user-wh3ld7dn3y]

Very very very useful mister net ninja. I had issues working in a team using git earlier. Thanks man!

[@baanun]

I like how you explain the concept with a real work scenario. Thank you very much. It helped me alot

[@praveen9083]

Tutorials are super useful! Thank you so much. Btw I like your humour sense, throughout these videos.

[@junaidbinkibria9403]

Absolutely recommend for beginners! Thank you Net Ninja for making it so simple for us to understand.

[@usernameseemstobemissing]

6 years later and still relevant!!

[@Tracks777]

I enjoyed the video! Keep it up!

[@Chiral01]

I have always been scared to work with git before, but now I am now confident working with git. Thanks "The Net Ninja".

[@PlantiPal]

This is the best/clearest tutorial I've seen on the subject. Thanks!

[@TheBlueMahoe]

you just gave me a push in the right direction...amazing

[@aarti9702]

Thanks TheNetNinja for such awesome content. Not just this one, but I have watched other playlists of yours. They are undoubtedly super awesome!

[@Escko]

Awesome as always

[@dawid_dahl]

Starting my first web dev job after studying online by myself for almost 3 years now. I want to thank you not only for this video, but for all of the amazing content you’ve done-it has helped me so much on my journey! 💙

[@queensley9006]

Congratulation on your job! I hope you have fun ✨

[@dawid_dahl]

@@queensley9006 Thank you so much. I was close to giving up so many times along the way, but now I am so very glad I didn’t and managed to stick with it even in the tough times. 🙏🏻🙂

[@queensley9006]

@@dawid_dahl I'm proud of you, keep it up! 💪🏼🙌🏼💯

[@chawong5860]

Your git tutorial is the best by far, thanks for your great work

[@MayankPandey4u]

Best tutorial series for Git & Github.

[@deepeshdang6198]

Again. amazzing video series on git ! Kudos man.. you are born teacher and educator. cheeers

[@Hacking-NASSA-with-HTML]

this tutorial is complete blessing❤👍

[@bit-rec98]

Excellent job Shaun! This playlist has been so useful and precise to learn how git/github works!

[@NetNinja]

Great to hear! thanks Cristian

[@basaramamba]

This is great. Straight to the point. Thanks Ninja.

[@EightHands]

best git tutorial ever watched! thank you.

[@riyaingale20]

Very clearly explained. I understood everything which I was trying to understand for so long.

[@utsavbudathoki2384]

By far the best playlist on KZbin about Git and Github

[@NetNinja]

Thanks :). Glad you like.

[@damiancoriasco2537]

Thanks so much for this, it really helps

[@bw7891]

lovely accent and lively rhythm, very clearly expained, great videos!

[@krishnachaitanyaravilla1448]

your vocie is super good and the visual work is awesome

[@vaisakmaritz8997]

Thank you so much shaun for this amazing course

[@ajwadakil6020]

working on a team based node-react project, this tut is awesome and also, love the accent bro :3

[@johannesluken949]

Thanks a lot! That really helped me as a beginner with Git/GitHub!

[@aliounebadara5675]

I will start a new job tomorrow as a junior developper and i feel very confident with git thanks to you... You're a genius!!!

[@NetNinja]

Thank you and good luck in the new job :)

[@jajanken8917]

These tutorials are really helpful, thanks man

[@kibs_neville]

Thankyou so much Shaun. Your tutorials are by far the best💯

[@NetNinja]

That means a lot. Thanks for watching Kibs! :)

[@linyafernandez3444]

Thank you for the amazing video!

[@carissajanedsouza1675]

Amazing video!

[@mindwasher1813]

Very very good tutorial. This is exactly what needed

[@daiyanibrahim8485]

Exactly what I wanted to know! thanks a lot

[@varunupadhyay2488]

That's really really good explanation

[@nancyfazal2536]

Your channel has helped me so much!! highly grateful :)

[@kevindivinagracia8620]

Even im not good in english i understand this TUtotrial. . i watch many tutorial but this tut. is different ... its like a paid tut.. Thanks. i wish i knew your channel before i get confuse of others tut videos... Thanks man ... fan from philippines here...

[@jamesang8735]

The best! Thank you!

[@hieutranminh893]

Best git tutorial ever

[@Riccardopelle98]

I start working this week with a team, this was very helpfull thanks :*

[@omid5258]

amazing tutorial, keep up the good work!

[@TheMcallist1]

Great vids - thanks

[@mariaponomarenko3006]

You are so cool, this tutorial is excellent, THANKS!!!

[@xmaxfuture]

Amazing and simple

[@davidcho4399]

Thank you i really needed this!!

[@vandanachandola322]

I always get confused whether I should merge changes to local master and then push to remote. Now I know I shouldn't.. Thanks for mentioning that and also for a great tutorial! I've been binging :)

[@briansagalla5482]

Very helpful tutorials

[@shadowshark290]

You described this so well! Thank you so much 😊 !

[@NetNinja]

No problem :) thanks for watching!

[@amyamnyWhatsYourName]

Thank you so much , this was very helpful .Now whenever I want to learn something , I go straight to the Net Ninja channel :)

[@daksmemes7428]

amazing tutorial by the way

[@FedeOttalagano]

super useful. Thanks!

[@swingoutmuseum6454]

Thoroughly enjoyed this video as well as others. You have a skill to present new topics. I am a newbie and followed along with minor problems.

[@NetNinja]

Awesome! Thanks so much :)

[@libvlog2264]

Very good tutorial .

[@abdelmalekbouguerra8133]

i love it keep it up 😍😍

[@_isaac_muniz_]

Thanks, teacher, good lesson!

[@Inandoutpk]

Vey Nice Explanation

[@rossho8946]

great tutorial, thank you so much

[@JordanAF808]

You're a legend.

[@mauriciomayorga3238]

Thank you so much for this series its very informative and ive learned so much

[@NetNinja]

You're very welcome! :) thanks for watching

[@akhilnarayanan7182]

I am really excited 12:02

[@OmerFarooqAhmed]

great video! thanks

[@abednigomagopane2400]

Best tutorial ever

[@NetNinja]

Thanks Abednigo!

[@AriKhuu]

Thank you!

[@cfv717]

wow just saw your videos...thanks a bunch!

[@royassouline3929]

Amazing thanks!

[@abhishek_sengupta]

Thanks a lot!

[@Victual88]

thank you!

[@MustafaBirsoz]

Love you Ninja

[@marcspataru]

When he scrolled down to reveal all the poop icons... lol

[@JassarDev]

I keep bumping into your tutorials and I love them! Thank you! Are all collaborators able to merge or is it just the owner? Hypothetical; what if you want to restrict reading access to certain files to hide some "trade secrets"?

[@ronidey7100]

Thank you so much :)

[@himanshurajput9406]

Nice explanation , i really liked ur vedios :)

[@mahmoodbina2193]

still Idk why you are so awesome !

[@nanayaw7979]

Still gold ! 😊

[@mdjahidulislam9205]

Thanks a lot

[@claytoncritchfield6231]

Thanks for this video! What would commands would you do if you and another developer are working on the same project simultaneously and they have a branch and you also have a separate branch and their changes git merged to the master branch before yours? I assume you'd have to use git pull origin main, but then would you checkout your branch and merge with main?

[@victoriakoenigbrok3163]

Thank you so much! I love all the turds!

[@hpottstock]

Great video!...but whatevs.

[@brunoggdev6305]

Thanks so much man

[@NetNinja]

No problem!

[@albertbravo7364]

thank you for this video sir

[@NetNinja]

Hope it was helpful Albert!

[@nommy8599]

5:53 _"I'll just add 'good work'. Because it is good work"_ It looked like a lot of crap to me! ( 3:06) ;) On a more serious note, I think it would be worth doing a tutorial on GitKraken and using git flow which it support out of the box. Using console to operate git version control when there's tools like this is akin to programming an app in machine code rather than using something like Flutter.

[@luphiax4239]

Sorry if I ask: if instead of pushing up the index.html branch at 4:30 we had pushed the master branch (so it means that we have worked directly on master branch without making the checkout) could have we had the possibility to do "compare & pull request"? Thanks in advance, your videos have been extremely useful to me!

[@compilewithdev]

thankyou bro🧡🧡

[@NetNinja]

You're very welcome Aravindh, thanks for watching! 😊

[@conaxliu9677]

4:26 I was having trouble here. Git could not resolve the branch name. After some testing I realised that Git/GitHub really doesn't like uppper case letters. I had my branch created as 'MyNewFeature" and Git just could not push the change to remote. Changing the branch name to "mynewfeature" or "my-new-feature" then push was actioned successfully.

[@tariklafi7704]

hey ninja! nice work, but is it necessary to specify the branch name (origin master/or-otherBranch) when pulling/pushing ? because git knows already in wich branche we are now.

[@braimahjake]

Thanks for the tutorial. My question is, after merging a pull request, how do I synchronize my local branch with the now updated master?

[@TheHadMatters]

So can you do all of this the same way nowadays and just do most of the git commands (and perhaps even the actions on the github website) inside VSCode? The commenting? The pulling and comparing? Or are the VSCode commands for Git limited compared to accessing the Bash directly, so you can do it mostly through the VSCode commandline on top and its terminal tab in the bottom menu? Or are those too restricted compared to editing in the Bash and on the website?

[@umslopogaas]

I want to synchronize my remote repository with a local one so that my remote repository becomes a 100% copy of the local one - meaning that if certain files differ in these repositories, I override the remote ones with the local ones, and if there are files in remote repositories that do not exist in the local, the remote files get removed. Is there any way to achieve that other than deleting the github existing repo and uploading the local ones again?

[@abdelkadermh]

Thanks

[@davideugene7911]

Merci :)