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

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

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

[@linequeenpublishing]

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

[@dreamscapeai7]

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

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

[@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! 💪🏼🙌🏼💯

[@david_law]

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

[@xcrxwadda8287]

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

[@baanun]

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

[@shalommbuthia7341]

honestly this is a quality video watched 2 other tutorials and after watching this i feel satisfied.Great work

[@NetNinja]

Awesome, thank you!

[@utsavbudathoki2384]

By far the best playlist on KZbin about Git and Github

[@NetNinja]

Thanks :). Glad you like.

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

[@Chiral01]

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

[@MayankPandey4u]

Best tutorial series for Git & Github.

[@junaidbinkibria9403]

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

[@G.H.KrishnaChaitanya]

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

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

[@praveen9083]

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

[@usernameseemstobemissing]

6 years later and still relevant!!

[@PlantiPal]

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

[@Hacking-NASSA-with-HTML]

this tutorial is complete blessing❤👍

[@aarti9702]

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

[@TheBlueMahoe]

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

[@Octo_Hands]

best git tutorial ever watched! thank you.

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

[@kibs_neville]

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

[@NetNinja]

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

[@Escko]

Awesome as always

[@bw7891]

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

[@chawong5860]

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

[@riyaingale20]

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

[@deepeshdang6198]

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

[@varunupadhyay2488]

That's really really good explanation

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

[@basaramamba]

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

[@johannesluken949]

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

[@Tracks777]

I enjoyed the video! Keep it up!

[@mindwasher1813]

Very very good tutorial. This is exactly what needed

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

[@ajwadakil6020]

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

[@krishnachaitanyaravilla1448]

your vocie is super good and the visual work is awesome

[@Riccardopelle98]

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

[@vaisakmaritz8997]

Thank you so much shaun for this amazing course

[@ΒινςΜοργκαν]

update*. master has changed to main!

[@jajanken8917]

These tutorials are really helpful, thanks man

[@amyamnyWhatsYourName]

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

[@mauriciomayorga3238]

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

[@NetNinja]

You're very welcome! :) thanks for watching

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

[@akhilnarayanan7182]

I am really excited 12:02

[@elecomart7646]

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]

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]

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.

[@nanayaw7979]

Still gold ! 😊

[@marcspataru]

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

[@abednigomagopane2400]

Best tutorial ever

[@NetNinja]

Thanks Abednigo!

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

[@nancyfazal2536]

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

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

[@ctchidambaram922]

Great tutorial. Can you provide video using GITHUB and visual studio 2022?

[@alpachino468]

Haha, you have classes called 'turds'. I'm going to do that next time I have a client's site to build, whom I don't like...

[@hpottstock]

Great video!...but whatevs.

[@mochamadrivan8758]

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

[@xmaxfuture]

Amazing and simple

[@omid5258]

amazing tutorial, keep up the good work!

[@shadowshark290]

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

[@NetNinja]

No problem :) thanks for watching!

[@hieutranminh893]

Best git tutorial ever

[@briansagalla5482]

Very helpful tutorials

[@mariaponomarenko3006]

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

[@linyafernandez3444]

Thank you for the amazing video!

[@damiancoriasco2537]

Thanks so much for this, it really helps

[@carissajanedsouza1675]

Amazing video!

[@Slavetomors]

I was a bit confused on the 'git push origin index-html' command, because to me, it looked like by specifying the index-html branch, that it was specifying the destination branch on the remote repo and if it wasn't there, to create it. I figured since I'm pushing from the branch that I have checked out, that it's implied what I'm pushing to the remote and so I should specify its branch destination on the remote. Turns out, just mentioning the branch is a shortcut... Per Git's documentation (link below): "If you didn’t want it to be called serverfix on the remote, you could instead run git push origin serverfix:awesomebranch to push your local serverfix branch to the awesomebranch branch on the remote project." git-scm.com/book/en/v2/Git-Branching-Remote-Branches

[@libvlog2264]

Very good tutorial .

[@user-eb5wl5le7r]

fantastic tutorial. thank you.

[@NetNinja]

Awesome! thanks for watching :)

[@TheMcallist1]

Great vids - thanks

[@rossho8946]

great tutorial, thank you so much

[@daksmemes7428]

amazing tutorial by the way

[@jamesang8735]

The best! Thank you!

[@daiyanibrahim8485]

Exactly what I wanted to know! thanks a lot

[@Rickety3263]

Do a video of your scatological naming conventions

[@randydiebold325]

Git-hub is great for group projects or developers with multiple personalities.

[@Inandoutpk]

Vey Nice Explanation

[@JordanAF808]

You're a legend.

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

[@FedeOttalagano]

super useful. Thanks!

[@davidcho4399]

Thank you i really needed this!!

[@_isaac_muniz_]

Thanks, teacher, good lesson!

[@cfv717]

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

[@MrWickedsouls]

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?

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

[@ddb3]

Seems "master branch" is now referred to as "main branch" so just substitute main for master, i.e. git pull origin master ---> git pull origin main

[@royassouline3929]

Amazing thanks!

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

[@amonraii7273]

Every time you say push I can't help but remember giving birth lol

[@abdelmalekbouguerra8133]

i love it keep it up 😍😍

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

[@AriKhuu]

Thank you!

[@peteryung3586]

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

[@bandermaster81]

Update for video: git pull origin main , not 'master' anymore.

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

[@gauravk1987]

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?