No video :(

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

Подписаться 1,5 млн

Просмотров 335 тыс.

50% 1

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

Опубликовано:

17 июн 2017

Ссылка:

Скачать:

Готовим ссылку...

Добавить в:

Мой плейлист

Посмотреть позже

Комментарии : 186

@meleecraft 7 лет назад

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

@chukwudaluayika8324 4 года назад

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

@dreamscapeai7 4 года назад

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

@pcumamahesh 9 месяцев назад

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

@sfk615 5 лет назад

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

@david_law Год назад

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

@aasiyamansoori1093 4 года назад

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 5 лет назад

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

@praveen9083 4 года назад

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

@baanun 3 года назад

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

@xcrxwadda8287 Год назад

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

@junaidbinkibria9403 4 года назад

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

@aarti9702 3 года назад

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 5 месяцев назад

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

@PlantiPal 3 года назад

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

@Chiral01 2 года назад

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

@deepeshdang6198 6 лет назад

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

@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

@dawid_dahl 2 года назад

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

@chawong5860 4 года назад

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

@MayankPandey4u 4 года назад

Best tutorial series for Git & Github.

@Tracks777 7 лет назад

I enjoyed the video! Keep it up!

@TheBlueMahoe 4 года назад

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

@riyaingale20 3 года назад

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

@basaramamba 4 года назад

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

@Escko Год назад

Awesome as always

@bw7891 3 года назад

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

@ajwadakil6020 4 года назад

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

@krishnachaitanyaravilla1448 6 лет назад

your vocie is super good and the visual work is awesome

@Hacking-NASSA-with-HTML Год назад

this tutorial is complete blessing❤👍

@utsavbudathoki2384 4 года назад

By far the best playlist on RU-vid about Git and Github

@NetNinja 4 года назад

Thanks :). Glad you like.

@johannesluken949 2 года назад

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

@amyamnyWhatsYourName 2 года назад

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

@EightHands 2 года назад

best git tutorial ever watched! thank you.

@varunupadhyay2488 6 месяцев назад

That's really really good explanation

@omid5258 2 года назад

amazing tutorial, keep up the good work!

@vaisakmaritz8997 3 года назад

Thank you so much shaun for this amazing course

@jajanken8917 3 года назад

These tutorials are really helpful, thanks man

@linyafernandez3444 2 года назад

Thank you for the amazing video!

@nancyfazal2536 3 года назад

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

@Riccardopelle98 3 года назад

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

@mindwasher1813 3 года назад

Very very good tutorial. This is exactly what needed

@libvlog2264 3 года назад

Very good tutorial .

@daiyanibrahim8485 2 года назад

Exactly what I wanted to know! thanks a lot

@kevindivinagracia8620 2 года назад

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

@usernameseemstobemissing 5 месяцев назад

6 years later and still relevant!!

@damiancoriasco2537 5 лет назад

Thanks so much for this, it really helps

@vandanachandola322 4 года назад

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 3 года назад

Very helpful tutorials

@mariaponomarenko3006 3 года назад

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

@swingoutmuseum6454 5 лет назад

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

@carissajanedsouza1675 5 лет назад

Amazing video!

@xmaxfuture 3 года назад

Amazing and simple

@aliounebadara5675 4 года назад

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

@abdelmalekbouguerra8133 3 года назад

i love it keep it up 😍😍

@kibs_neville 10 месяцев назад

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

@NetNinja 10 месяцев назад

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

@daksmemes7428 4 года назад

amazing tutorial by the way

@Inandoutpk 2 года назад

Vey Nice Explanation

@TheMcallist1 5 лет назад

Great vids - thanks

@hieutranminh893 3 года назад

Best git tutorial ever

@jamesang8735 Год назад

The best! Thank you!

@JassarDev 4 года назад

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

@shadowshark290 2 года назад

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

@NetNinja 2 года назад

No problem :) thanks for watching!

@rossho8946 3 года назад

great tutorial, thank you so much

@davidcho4399 4 года назад

Thank you i really needed this!!

@FedeOttalagano 6 лет назад

super useful. Thanks!

@mauriciomayorga3238 9 месяцев назад

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

@NetNinja 9 месяцев назад

You're very welcome! :) thanks for watching

@himanshurajput9406 4 года назад

Nice explanation , i really liked ur vedios :)

@user-eb5wl5le7r 27 дней назад

fantastic tutorial. thank you.

@NetNinja 26 дней назад

Awesome! thanks for watching :)

@_isaac_muniz_ 2 года назад

Thanks, teacher, good lesson!

@cfv717 4 года назад

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

@OmerFarooqAhmed 6 лет назад

great video! thanks

@akhilnarayanan7182 2 года назад

I am really excited 12:02

@abednigomagopane2400 Год назад

Best tutorial ever

@NetNinja Год назад

Thanks Abednigo!

@claytoncritchfield6231 6 месяцев назад

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?

@mahmoodbina2193 Год назад

still Idk why you are so awesome !

@JordanAF808 3 года назад

You're a legend.

@luphiax4239 3 года назад

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!

@albertbravo7364 Год назад

thank you for this video sir

@NetNinja Год назад

Hope it was helpful Albert!

@tariklafi7704 6 лет назад

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 3 года назад

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

@royassouline3929 4 года назад

Amazing thanks!

@nommy8599 4 года назад

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.

@elecomart7646 7 лет назад

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.

@AriKhuu 11 месяцев назад

Thank you!

@marcspataru 4 года назад

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

@ronidey7100 3 года назад

Thank you so much :)

@hpottstock 7 лет назад

Great video!...but whatevs.

@victoriakoenigbrok3163 2 года назад

Thank you so much! I love all the turds!

@nanayaw7979 Год назад

Still gold ! 😊

@abhishek_sengupta 3 года назад

Thanks a lot!

@MustafaBirsoz 4 года назад

Love you Ninja

@Victual88 3 года назад

thank you!

@brunoggdev6305 Год назад

Thanks so much man

@NetNinja Год назад

No problem!

@TheHadMatters 10 месяцев назад

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?

@ilhomhuja 6 лет назад

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

@umslopogaas 4 года назад

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 Год назад

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

@danieljohns1318 7 лет назад

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.