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
0:43 The Net Ninja: 'there's just one of me' - you damn right, and we appreciate the quality tutorials you keep pushin
Super-simple and elegant explanation. I thought that git branches were too complicated, but now I see it clearly.
You are so awesome at breaking down not so straight-forward concepts. This is the best git tutorial I've seen on KZread
They should rename "Pull Request" to "Merge Request" and make it less confusing. Great videos BTW, clear, concise and to the point. Kudos!
@conaxliu9677
4 жыл бұрын
I agree. Merge Request makes more sense.
@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
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
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
3 жыл бұрын
Someone should make an extension for chrome that changes the html code on te button xD
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
4 жыл бұрын
Thank you so much :)
Short, clear, and closest to my working environment. Best I could find so far. Thank you!
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 :))
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
4 жыл бұрын
*me reading this after 11 months after spending my whole afternoon watching his git videos* XD
@zakariaamehri3465
4 жыл бұрын
@@anuragshandilya3556 me readin this after a week spending my whole afternoon watching his git videos XD
@melaninrx
3 жыл бұрын
So true. I like how he broke down the videos so you could go right to what you needed.
@vivekjoshi3769
2 жыл бұрын
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
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
6 жыл бұрын
Thank you so much :). Very much appreciated.
5yrs and it's still helpful, you saved my day
I like how you explain the concept with a real work scenario. Thank you very much. It helped me alot
Tutorials are super useful! Thank you so much. Btw I like your humour sense, throughout these videos.
Absolutely recommend for beginners! Thank you Net Ninja for making it so simple for us to understand.
I have always been scared to work with git before, but now I am now confident working with git. Thanks "The Net Ninja".
Thanks TheNetNinja for such awesome content. Not just this one, but I have watched other playlists of yours. They are undoubtedly super awesome!
Very very very useful mister net ninja. I had issues working in a team using git earlier. Thanks man!
This is the best/clearest tutorial I've seen on the subject. Thanks!
Again. amazzing video series on git ! Kudos man.. you are born teacher and educator. cheeers
Your git tutorial is the best by far, thanks for your great work
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...
you just gave me a push in the right direction...amazing
Very clearly explained. I understood everything which I was trying to understand for so long.
Excellent job Shaun! This playlist has been so useful and precise to learn how git/github works!
@NetNinja
Жыл бұрын
Great to hear! thanks Cristian
By far the best playlist on KZread about Git and Github
@NetNinja
4 жыл бұрын
Thanks :). Glad you like.
working on a team based node-react project, this tut is awesome and also, love the accent bro :3
Thankyou so much Shaun. Your tutorials are by far the best💯
@NetNinja
10 ай бұрын
That means a lot. Thanks for watching Kibs! :)
This is great. Straight to the point. Thanks Ninja.
Best tutorial series for Git & Github.
lovely accent and lively rhythm, very clearly expained, great videos!
I enjoyed the video! Keep it up!
Thanks a lot! That really helped me as a beginner with Git/GitHub!
6 years later and still relevant!!
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
2 жыл бұрын
Congratulation on your job! I hope you have fun ✨
@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
2 жыл бұрын
@@dawid_dahl I'm proud of you, keep it up! 💪🏼🙌🏼💯
this tutorial is complete blessing❤👍
your vocie is super good and the visual work is awesome
Awesome as always
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
4 жыл бұрын
Thank you and good luck in the new job :)
Thank you so much , this was very helpful .Now whenever I want to learn something , I go straight to the Net Ninja channel :)
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 :)
I start working this week with a team, this was very helpfull thanks :*
Thank you so much shaun for this amazing course
Your channel has helped me so much!! highly grateful :)
These tutorials are really helpful, thanks man
Thank you for the amazing video!
best git tutorial ever watched! thank you.
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
5 жыл бұрын
Awesome! Thanks so much :)
amazing tutorial, keep up the good work!
You are so cool, this tutorial is excellent, THANKS!!!
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"?
Exactly what I wanted to know! thanks a lot
Thanks so much for this, it really helps
Thanks for the tutorial. My question is, after merging a pull request, how do I synchronize my local branch with the now updated master?
That's really really good explanation
You described this so well! Thank you so much 😊 !
@NetNinja
2 жыл бұрын
No problem :) thanks for watching!
Very very good tutorial. This is exactly what needed
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!
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.
The best! Thank you!
Very helpful tutorials
Thank you so much for this series its very informative and ive learned so much
@NetNinja
9 ай бұрын
You're very welcome! :) thanks for watching
Amazing and simple
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?
Very good tutorial .
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
Amazing video!
Thank you i really needed this!!
amazing tutorial by the way
Vey Nice Explanation
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?
How did you get the two windows of Cmdr and the other editor program to line up side by side each other?
i love it keep it up 😍😍
Great vids - thanks
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.
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?
great tutorial, thank you so much
Best git tutorial ever
fantastic tutorial. thank you.
@NetNinja
9 күн бұрын
Awesome! thanks for watching :)
Thanks, teacher, good lesson!
super useful. Thanks!
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?
great video! thanks
wow just saw your videos...thanks a bunch!
Best tutorial ever
@NetNinja
Жыл бұрын
Thanks Abednigo!
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?
I am really excited 12:02
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?
Little question, what happens to the branch on your local dude? Thank you, but whatevs.
Nice explanation , i really liked ur vedios :)
what if the team repo is private, how do you pull it?
Thank you!
You're a legend.
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.
Amazing thanks!
what if between 'add images' and 'add last image' someone modified the master ?
still Idk why you are so awesome !
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
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
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.
Thank you so much :)
Thanks a lot!
thank you for this video sir
@NetNinja
Жыл бұрын
Hope it was helpful Albert!
When you pull in the merged master from remote, is it supposed to delete the merged branch on local too?
@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.