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

Пікірлер: 188

  • @meleecraft
    @meleecraft7 жыл бұрын

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

  • @pcumamahesh
    @pcumamahesh9 ай бұрын

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

  • @dreamscapeai7
    @dreamscapeai74 жыл бұрын

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

  • @sfk615
    @sfk6155 жыл бұрын

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

  • @conaxliu9677

    @conaxliu9677

    4 жыл бұрын

    I agree. Merge Request makes more sense.

  • @CustardCream33

    @CustardCream33

    3 жыл бұрын

    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

    @iamdannywyatt

    3 жыл бұрын

    @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

    @geebsayshi

    3 жыл бұрын

    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

    @tulkaz

    3 жыл бұрын

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

  • @chukwudaluayika8324
    @chukwudaluayika83244 жыл бұрын

    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

    @NetNinja

    4 жыл бұрын

    Thank you so much :)

  • @david_law
    @david_law Жыл бұрын

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

  • @aasiyamansoori1093
    @aasiyamansoori10934 жыл бұрын

    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 :))

  • @franciscosusana2292
    @franciscosusana22925 жыл бұрын

    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

    @anuragshandilya3556

    4 жыл бұрын

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

  • @zakariaamehri3465

    @zakariaamehri3465

    4 жыл бұрын

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

  • @melaninrx

    @melaninrx

    3 жыл бұрын

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

  • @vivekjoshi3769

    @vivekjoshi3769

    2 жыл бұрын

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

  • @raisama4314

    @raisama4314

    Жыл бұрын

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

  • @cafedelevant7353
    @cafedelevant73536 жыл бұрын

    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

    @NetNinja

    6 жыл бұрын

    Thank you so much :). Very much appreciated.

  • @xcrxwadda8287
    @xcrxwadda8287 Жыл бұрын

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

  • @baanun
    @baanun3 жыл бұрын

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

  • @praveen9083
    @praveen90834 жыл бұрын

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

  • @junaidbinkibria9403
    @junaidbinkibria94034 жыл бұрын

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

  • @Chiral01
    @Chiral012 жыл бұрын

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

  • @aarti9702
    @aarti97023 жыл бұрын

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

  • @user-wh3ld7dn3y
    @user-wh3ld7dn3y4 ай бұрын

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

  • @PlantiPal
    @PlantiPal3 жыл бұрын

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

  • @deepeshdang6198
    @deepeshdang61986 жыл бұрын

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

  • @chawong5860
    @chawong58604 жыл бұрын

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

  • @kevindivinagracia8620
    @kevindivinagracia86202 жыл бұрын

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

  • @TheBlueMahoe
    @TheBlueMahoe4 жыл бұрын

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

  • @riyaingale20
    @riyaingale203 жыл бұрын

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

  • @bit-rec98
    @bit-rec98 Жыл бұрын

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

  • @NetNinja

    @NetNinja

    Жыл бұрын

    Great to hear! thanks Cristian

  • @utsavbudathoki2384
    @utsavbudathoki23844 жыл бұрын

    By far the best playlist on KZread about Git and Github

  • @NetNinja

    @NetNinja

    4 жыл бұрын

    Thanks :). Glad you like.

  • @ajwadakil6020
    @ajwadakil60204 жыл бұрын

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

  • @kibs_neville
    @kibs_neville10 ай бұрын

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

  • @NetNinja

    @NetNinja

    10 ай бұрын

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

  • @basaramamba
    @basaramamba4 жыл бұрын

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

  • @MayankPandey4u
    @MayankPandey4u4 жыл бұрын

    Best tutorial series for Git & Github.

  • @bw7891
    @bw78913 жыл бұрын

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

  • @Tracks777
    @Tracks7777 жыл бұрын

    I enjoyed the video! Keep it up!

  • @johannesluken949
    @johannesluken9492 жыл бұрын

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

  • @usernameseemstobemissing
    @usernameseemstobemissing5 ай бұрын

    6 years later and still relevant!!

  • @dawid_dahl
    @dawid_dahl2 жыл бұрын

    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

    @queensley9006

    2 жыл бұрын

    Congratulation on your job! I hope you have fun ✨

  • @dawid_dahl

    @dawid_dahl

    2 жыл бұрын

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

    @queensley9006

    2 жыл бұрын

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

  • @Hacking-NASSA-with-HTML
    @Hacking-NASSA-with-HTML Жыл бұрын

    this tutorial is complete blessing❤👍

  • @krishnachaitanyaravilla1448
    @krishnachaitanyaravilla14486 жыл бұрын

    your vocie is super good and the visual work is awesome

  • @Escko
    @Escko Жыл бұрын

    Awesome as always

  • @aliounebadara5675
    @aliounebadara56754 жыл бұрын

    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

    @NetNinja

    4 жыл бұрын

    Thank you and good luck in the new job :)

  • @amyamnyWhatsYourName
    @amyamnyWhatsYourName2 жыл бұрын

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

  • @vandanachandola322
    @vandanachandola3224 жыл бұрын

    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 :)

  • @Riccardopelle98
    @Riccardopelle983 жыл бұрын

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

  • @vaisakmaritz8997
    @vaisakmaritz89973 жыл бұрын

    Thank you so much shaun for this amazing course

  • @nancyfazal2536
    @nancyfazal25363 жыл бұрын

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

  • @jajanken8917
    @jajanken89173 жыл бұрын

    These tutorials are really helpful, thanks man

  • @linyafernandez3444
    @linyafernandez34442 жыл бұрын

    Thank you for the amazing video!

  • @EightHands
    @EightHands2 жыл бұрын

    best git tutorial ever watched! thank you.

  • @swingoutmuseum6454
    @swingoutmuseum64545 жыл бұрын

    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

    @NetNinja

    5 жыл бұрын

    Awesome! Thanks so much :)

  • @omid5258
    @omid52582 жыл бұрын

    amazing tutorial, keep up the good work!

  • @mariaponomarenko3006
    @mariaponomarenko30063 жыл бұрын

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

  • @JassarDev
    @JassarDev4 жыл бұрын

    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"?

  • @daiyanibrahim8485
    @daiyanibrahim84852 жыл бұрын

    Exactly what I wanted to know! thanks a lot

  • @damiancoriasco2537
    @damiancoriasco25375 жыл бұрын

    Thanks so much for this, it really helps

  • @braimahjake
    @braimahjake3 жыл бұрын

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

  • @varunupadhyay2488
    @varunupadhyay24885 ай бұрын

    That's really really good explanation

  • @shadowshark290
    @shadowshark2902 жыл бұрын

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

  • @NetNinja

    @NetNinja

    2 жыл бұрын

    No problem :) thanks for watching!

  • @mindwasher1813
    @mindwasher18133 жыл бұрын

    Very very good tutorial. This is exactly what needed

  • @luphiax4239
    @luphiax42393 жыл бұрын

    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!

  • @tariklafi7704
    @tariklafi77046 жыл бұрын

    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.

  • @jamesang8735
    @jamesang8735 Жыл бұрын

    The best! Thank you!

  • @briansagalla5482
    @briansagalla54823 жыл бұрын

    Very helpful tutorials

  • @mauriciomayorga3238
    @mauriciomayorga32389 ай бұрын

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

  • @NetNinja

    @NetNinja

    9 ай бұрын

    You're very welcome! :) thanks for watching

  • @xmaxfuture
    @xmaxfuture3 жыл бұрын

    Amazing and simple

  • @claytoncritchfield6231
    @claytoncritchfield62315 ай бұрын

    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?

  • @libvlog2264
    @libvlog22643 жыл бұрын

    Very good tutorial .

  • @ilhomhuja
    @ilhomhuja6 жыл бұрын

    when adding second commit sometimes git gives an error message: rejected, use git pull..... this case: i simply used new command: git push -f origin master and this worked for me

  • @carissajanedsouza1675
    @carissajanedsouza16755 жыл бұрын

    Amazing video!

  • @davidcho4399
    @davidcho43994 жыл бұрын

    Thank you i really needed this!!

  • @daksmemes7428
    @daksmemes74284 жыл бұрын

    amazing tutorial by the way

  • @Inandoutpk
    @Inandoutpk2 жыл бұрын

    Vey Nice Explanation

  • @umslopogaas
    @umslopogaas4 жыл бұрын

    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?

  • @peteryung3586
    @peteryung3586 Жыл бұрын

    How did you get the two windows of Cmdr and the other editor program to line up side by side each other?

  • @abdelmalekbouguerra8133
    @abdelmalekbouguerra81333 жыл бұрын

    i love it keep it up 😍😍

  • @TheMcallist1
    @TheMcallist15 жыл бұрын

    Great vids - thanks

  • @conaxliu9677
    @conaxliu96774 жыл бұрын

    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.

  • @gauravk1987
    @gauravk19874 жыл бұрын

    hi shaun can you explain the difference between git push -u origin feature-1 and git push origin feature-1. what is -u used for?

  • @rossho8946
    @rossho89463 жыл бұрын

    great tutorial, thank you so much

  • @hieutranminh893
    @hieutranminh8933 жыл бұрын

    Best git tutorial ever

  • @user-eb5wl5le7r
    @user-eb5wl5le7r10 күн бұрын

    fantastic tutorial. thank you.

  • @NetNinja

    @NetNinja

    9 күн бұрын

    Awesome! thanks for watching :)

  • @_isaac_muniz_
    @_isaac_muniz_2 жыл бұрын

    Thanks, teacher, good lesson!

  • @FedeOttalagano
    @FedeOttalagano6 жыл бұрын

    super useful. Thanks!

  • @MrWickedsouls
    @MrWickedsouls4 жыл бұрын

    App perfect scenarios. You always have to pull before you start new branch. But what if a lot of people are working on the project? How to deal with changes then?

  • @OmerFarooqAhmed
    @OmerFarooqAhmed6 жыл бұрын

    great video! thanks

  • @cfv717
    @cfv7174 жыл бұрын

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

  • @abednigomagopane2400
    @abednigomagopane2400 Жыл бұрын

    Best tutorial ever

  • @NetNinja

    @NetNinja

    Жыл бұрын

    Thanks Abednigo!

  • @TheHadMatters
    @TheHadMatters10 ай бұрын

    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?

  • @akhilnarayanan7182
    @akhilnarayanan71822 жыл бұрын

    I am really excited 12:02

  • @daksmemes7428
    @daksmemes74284 жыл бұрын

    do i need to create everytime a branch for them to review? thats a lot of branch right there. Is this the usuall approach of companies?

  • @mochamadrivan8758
    @mochamadrivan87583 жыл бұрын

    Little question, what happens to the branch on your local dude? Thank you, but whatevs.

  • @himanshurajput9406
    @himanshurajput94064 жыл бұрын

    Nice explanation , i really liked ur vedios :)

  • @js_programmer8423
    @js_programmer84234 жыл бұрын

    what if the team repo is private, how do you pull it?

  • @AriKhuu
    @AriKhuu10 ай бұрын

    Thank you!

  • @JordanAF808
    @JordanAF8083 жыл бұрын

    You're a legend.

  • @nommy8599
    @nommy85994 жыл бұрын

    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.

  • @royassouline3929
    @royassouline39294 жыл бұрын

    Amazing thanks!

  • @abhisekchowdhury8584
    @abhisekchowdhury85844 жыл бұрын

    what if between 'add images' and 'add last image' someone modified the master ?

  • @mahmoodbina2193
    @mahmoodbina2193 Жыл бұрын

    still Idk why you are so awesome !

  • @elecomart7646
    @elecomart76467 жыл бұрын

    Great series Ninja. Could you explain what would happen if I pull to the local master (as you describe), then branch from master, then spend some time working in the branch. In the meantime, a co-worker changes master (on the remote). So master, on the remote, has moved on from the point at which I pulled from it. What happens when I push my branch: Does it still go to the remote ok? Can I still create a pull request from it? Or will Git(hub) insist on some sort of merge before? Hope I've explained that ok!

  • @ImPilon

    @ImPilon

    5 жыл бұрын

    not entirely sure so someone please correct me if I'm wrong, but I believe you would just get a conflict error if there was overlap of the files you both edited, which would require resolving.

  • @blayke602

    @blayke602

    4 жыл бұрын

    pretty sure you have figured this out already.. But normally , in the scenario you provided ,, what ill probbably do is switch from my local master branch , pull updates your colleague has made, then switch out to my feature branch( specific branch your working on) and do a git merge from the local master to feature branch. Resolve issues just in case , and then you can push changes on your remote branch and do a pull request.

  • @ronidey7100
    @ronidey71003 жыл бұрын

    Thank you so much :)

  • @abhishek_sengupta
    @abhishek_sengupta3 жыл бұрын

    Thanks a lot!

  • @albertbravo7364
    @albertbravo7364 Жыл бұрын

    thank you for this video sir

  • @NetNinja

    @NetNinja

    Жыл бұрын

    Hope it was helpful Albert!

  • @danieljohns1318
    @danieljohns13187 жыл бұрын

    When you pull in the merged master from remote, is it supposed to delete the merged branch on local too?

  • @danieljohns1318

    @danieljohns1318

    7 жыл бұрын

    When I deleted the the index-html and img-update branches on github and then pulled the origin to my master, those two branches were still on my local machine.