Тёмный

How to use GIT when working with a team? 

Ako Dev
Подписаться 799
Просмотров 175 тыс.
50% 1

Hi all welcome to ako.dev! So you know git... now how do you use it when you work with a team for work or on a project? do you just use the same branch? Lets try and put a workflow together so it makes our lives easier!
Take a look at a book called Code Complete and its series! If you want to prepare yourself for real scenarios this is a book everybody should read!
amzn.to/3qE0iDd

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

 

26 сен 2024

Поделиться:

Ссылка:

Скачать:

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

Добавить в:

Мой плейлист
Посмотреть позже
Комментарии : 126   
@auchucknorris
@auchucknorris 3 года назад
extremely straightforward and practical, much appreciated, and I'm sure my team will appreciate me not ruining the master and endless merge conflicts, memeing myself
@johannesluken949
@johannesluken949 2 года назад
helped a lot!! :) Thank you!
@8koi245
@8koi245 Год назад
kekW
@NukhbaAhmadAli
@NukhbaAhmadAli 4 дня назад
Facing the same issues....Accidentally created the merge for master or pr for wrong branches i am messing it up
@zb2747
@zb2747 Год назад
A lot of tutorials on youtube regarding this but you my friend have made it simple and without the 'fluff' - straight to the point and with a simple practical example.
@HimmReaper
@HimmReaper Год назад
Well explained! I was struggling trying to understand how to do certain functionality prior to watching this and now my questions have been answered. Thank you!
@akodev
@akodev Год назад
Anything I can do! This was something I struggled with early on as well. Let me know any topics you’d like to hear!
@Juanah92
@Juanah92 3 года назад
This was great in portraying the actual practicality of git/github. I needed this, thanks.
@LinLin-lg9qt
@LinLin-lg9qt 2 года назад
Thanks for this very helpful and practical tutorial. This is the video that I am looking for after learning the basic knowledge of Git.
@Jeff24Y
@Jeff24Y Год назад
Thank you so much for the video! This has helped me tremendoulsy at my first job! Also the book Code Complete that you suggested in the video description is a winner! A big big big reason why i was able to get past some of my tech interviews while applying to jobs. If you haven't read code complete i highly suggest checking it out. Link in bio!!
@akodev
@akodev Год назад
Thrilled to hear the video made a difference for you! "Code Complete" is indeed a gem. Always happy to share resources that can uplift the community. Keep pushing forward!
@its.arjun.s
@its.arjun.s 2 года назад
Thank you so much for this... I was confused watching a lot of other tutorials but this cleared my doubts
@grantdoyle1259
@grantdoyle1259 Год назад
This was a great video for me to document the git process for my team, thanks!
@boredguy5805
@boredguy5805 8 месяцев назад
So helpful for us noobs man, thank you for making this
@sarvarjuraev1376
@sarvarjuraev1376 Год назад
Thanks a lot. Very useful and straightforward 🙌🙌
@akodev
@akodev Год назад
You're welcome!
@kuoyulu6714
@kuoyulu6714 Год назад
Thanks for this video, I learn a lot from this!
@akodev
@akodev Год назад
Of course! Let me know if there’s any other topics you’d want to hear!
@yuvraajkandel1705
@yuvraajkandel1705 2 года назад
That's an awesome practical tutorial.. Thanks
@akodev
@akodev 2 года назад
Glad it was helpful!
@CengizSalgin
@CengizSalgin 2 года назад
Great video! Super clear and to the point! A lot of other tutorials dont cover the team working workflow but this is gold! What about using more branches like release and hotfix? Are there good examples how to use those? Greetings from germany 🙂
@MichaelCheung-z2v
@MichaelCheung-z2v Месяц назад
Here's a scenario: Time 1: A created a feature branch based on master. Time 2: A worked on 1 commit on the feature branch. Time 3: There is a new commit (maybe a merge) in the master branch. Time 4: The next day, A wants to continue to work on the feature branch. Question: Should he do a git pull in the morning before doing his work? Also, after the pull, how should he incorporate the changes in master into his feature branch? Or should he? Lastly, if the changes in master totally removed some main functions where his feature branch is based on, what should he do? Thank you!!
@super7ace
@super7ace Год назад
Thank you so much. Very informative video.
@akodev
@akodev Год назад
Anything I can do to help! Please let me know if there are other topics you’d like to hear about!
@keifer7813
@keifer7813 Год назад
Just what I needed, legend
@AbdurrahmanASUR
@AbdurrahmanASUR Год назад
same
@searching_knowledge_tjk
@searching_knowledge_tjk 6 месяцев назад
I was curious about the private repo, how I will add contributors, and how to put limited access, such as branches, so they could not push changes to the repo as origin main or master.?? Thank you very much!!!
@thestophewatts6689
@thestophewatts6689 2 года назад
Great simple video, helped me a lot, thank you!
@Laflamablanca969
@Laflamablanca969 3 года назад
Good video! Thanks for making it very simple
@hannesbeukes345
@hannesbeukes345 2 года назад
shoutout to all the oldschool coders that did not abandon SVN for git
@WordsThroughTheSky
@WordsThroughTheSky 3 года назад
nice video, what extension/module in iterm shows the branch like how you have it? I want to try it too :)
@akodev
@akodev 3 года назад
Here is a link that can help you set it up gist.github.com/kevin-smets/8568070 let me know how it goes
@WordsThroughTheSky
@WordsThroughTheSky 3 года назад
@@akodev thank you! That’s what I was looking for :)
@joshuahuang3665
@joshuahuang3665 Год назад
I like how you get to the point with this video. Great examples showing a successful merge and resolving a conflict. When you are on a tix-5 branch, does that the tix-5 branch show up on your local file directory? I see you can confirm which branch you are on in the terminal, but I am curious if you can visualize it when you're working on local? thank you.
@aniketpattiwar4816
@aniketpattiwar4816 Год назад
Use VS code ..to visualize on locally
@akodev
@akodev Год назад
if you want to see local branches ' git branch ' and if you want to see the remote branches (those on your github) then do ' git branch -r ' let me know if that helps
@the_new_a1
@the_new_a1 3 года назад
Can someone help me understand, Why does it cause a merge conflict when the changes are made the second time? What was different from the first pull request that didn't cause conflicts? Thanks
@CengizSalgin
@CengizSalgin 2 года назад
it was because he made the change in the same line. git didnt know which one to chose so you have to do it manually. that happened when he chose to use the new change instead of the old one in master. Hope that helps! :)
@michaelcheung6290
@michaelcheung6290 9 месяцев назад
This is the best! Can you tell us more what happens if you find sth wrong after pushing to origin
@Veectory
@Veectory 3 года назад
Cant believ you only have 82 subs. Cheers!
@ДаниилМирошник-ц4д
Thank you very much!
@zaranadesai4632
@zaranadesai4632 Год назад
Extremely helpful! Thanks!
@akodev
@akodev Год назад
Glad it helped!
@albinjoalex2086
@albinjoalex2086 2 года назад
Thanks a lot , u have saved a lot of hours for me
@emirhansozan8993
@emirhansozan8993 3 года назад
Appreciate your work, well explained :)
@FlutterPythoncombo
@FlutterPythoncombo 5 месяцев назад
Loving it , Thanks man!
@akodev
@akodev 2 месяца назад
Glad to hear it!
@alejandrogalinamata2234
@alejandrogalinamata2234 3 года назад
amazing! i was looking for this information and u made it! Thanks a lot
@akodev
@akodev 3 года назад
Glad it was helpful! let me know if you have any other things you looking for, always looking for ideas for content
@ShubhamKumar-mk6zb
@ShubhamKumar-mk6zb 7 месяцев назад
helped much! Thank you!!
@santiagorauldiaz-geoagro9132
@santiagorauldiaz-geoagro9132 3 года назад
thank you for the video !! It was very useful for me!
@sayeesreeram
@sayeesreeram 2 года назад
Greattt Video was very helpful
@itsadityas
@itsadityas 3 года назад
Great video! Really really helpful..🙌🙌🙌🙌
@CodeandDream
@CodeandDream 3 года назад
Nice video 😆 this will definitely come in handy
@CengizSalgin
@CengizSalgin 2 года назад
but shouldnt the pull origin master be before pushing the feature branch?
@snowman6000
@snowman6000 4 года назад
Great Video!
@doomer4636
@doomer4636 3 года назад
very good video
@ajk7151
@ajk7151 2 года назад
excellent video!
@Razordreamz
@Razordreamz 10 месяцев назад
what is the -A parameter used for? Looks like an "all" but git add already does that so it's why i'm asking.
@akodev
@akodev 10 месяцев назад
you are right, and this is mroe a habit, nowadays git add defaults behind the scene to git add -A. here is what the official documentation says: ``` -A --all If no is given when -A option is used, all files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories). ```
@juhairahamed5342
@juhairahamed5342 2 года назад
Good explanation
@samtech6181
@samtech6181 2 года назад
thank you bro, very useful!
@psychoonaut
@psychoonaut 3 года назад
Thanks a lot. It really helped me
@Mfbzai
@Mfbzai 10 месяцев назад
Wonderfull
@md.tohidulislam3012
@md.tohidulislam3012 2 года назад
much appreciated brother
@robinthomsoncomposer
@robinthomsoncomposer 2 года назад
Very helpful indeed
@Tyheir
@Tyheir Год назад
Awesome video, I had so much trouble resolving merge conflicts before. Is there a certain extension needed in VScode to get those accept changes options?
@williamavasquez
@williamavasquez Год назад
nope, it should just come up, you can always try to restart vscode if it doesnt pick it up.
@prakashmukta
@prakashmukta Год назад
Awesome Explanation. Very Straight forward. Can you clarify my doubt. I am new to git. In your video when you pushed new branch to remote. Branch created in Origin with All Files, in that Branch we see all files instead of just Committed files. You committed only one file right .. But we see 2 files in that newly created branch. In My Project I have 100's of files For every small change if i push that branch, All files will be pushed. Can i Create New Branch with Only Committed files ? Thank You
@akodev
@akodev Год назад
Hey Prakash, when you create a new branch, you are making a temporary copy, when making changes only those changes will be pushed, no need to be pushing 1000's of files. thats why git is so cool, because it only updates the files where changes have been made. I would probably check if your .git, is not outside of the original repo folder.
@shibu3448
@shibu3448 Год назад
Thanks a lot!
@jayavaiya9400
@jayavaiya9400 3 года назад
thanks , this is helpful
@myworld73473
@myworld73473 2 года назад
Thank you.
@doufreen-8701
@doufreen-8701 2 года назад
Thanks man, that's so usefull
@LavanyaD-n7c
@LavanyaD-n7c 3 месяца назад
Constantly pull from master ? Or branch we create day by day?
@akodev
@akodev 3 месяца назад
Pull from master to keep your branch up to date
@mikefochtman7164
@mikefochtman7164 3 года назад
I see you delete the branch after fixing up the ticket on the local repo, but what about the repository on git-hub? Is that deleted when you do another 'push', or what?
@akodev
@akodev 2 года назад
Unless you push the command ( git push origin --delete nameOfBranch) we have only deleted it locally.
@geraldbustos
@geraldbustos 3 года назад
Gracias!
@Simon-vz9uw
@Simon-vz9uw 2 года назад
Thank u so much!
@khaledkachkorian2486
@khaledkachkorian2486 3 года назад
Hello william, excellent video. It explains the practical part of git, and not the theory. A question please, if you are searching to do another video on git, can it be about fetch. The complete practical side of fetch vs the pull. Remember, we do not want a theoretical explanation, we need a practical logic from your experience. Thanks a lot
@williamavasquez
@williamavasquez 3 года назад
ru-vid.com/video/%D0%B2%D0%B8%D0%B4%D0%B5%D0%BE-1qO9eZANVgQ.html&ab_channel=AkoDev We made this one :) let us know what you think
@johnconnor9787
@johnconnor9787 Год назад
Please, can anyone help When you clone repository - did you do it on the companies repository or we should fork, and clone from the copy of our account?
@akodev
@akodev Год назад
sorry for the delayed response, but you dont need to fork it, you should be able to clone the repo locally.
@TinyGhost42
@TinyGhost42 Год назад
hey, how'd you get your terminal to look like that?
@akodev
@akodev Год назад
I have the cobalt theme, and im using iterm2 with oh-my-zsh.
@hakimfazal426
@hakimfazal426 3 года назад
outstanding video
@akodev
@akodev 3 года назад
Thank you so much 😀
@zylascope
@zylascope 2 года назад
Thanks.
@tehleelmir4407
@tehleelmir4407 2 года назад
Thanks man
@rajeshs8846
@rajeshs8846 Год назад
Does pushing local branch to github automatically creates pull request( merging the branch to master branch) ?
@akodev
@akodev Год назад
no it does not, on github it shows a suggestion, but its not automatic (can you make it automatic, we can make a video how to do that)
@aaryan3461
@aaryan3461 3 года назад
nice video man
@akodev
@akodev 3 года назад
Appreciate it
@quackdoescrck3009
@quackdoescrck3009 3 года назад
Question : Which files to never push to github .. for example the google-json file in mobile development?
@akodev
@akodev 3 года назад
Its going to depend on the language, but in JS I would avoid the node_module, .env file (passwords, keys etc) and if you on a mac the DS_Store.
@1001-w5q
@1001-w5q 3 года назад
everything others don't necessarily need to run the project smoothly (vscode folder, node_modules) and sensitive information. If you use create-react-app, that will add all of those to gitignore.
@tesohh
@tesohh 3 года назад
@@akodev where is the .env file?
@akodev
@akodev 3 года назад
You would have to create the .env file. Also if you use a .gitignore file you can name the files/directory’s you don’t want to push to git
@danneytee
@danneytee 2 года назад
Question: what is the point of delete the older ticket branch if it doesnt remove the branch on github?
@williamavasquez
@williamavasquez 2 года назад
People like to see what branches they actually are working on, so instead of having a lot of dead branches, it cleans it up and is easier to see where you are or what you have outstanding
@chuckwalla2967
@chuckwalla2967 Год назад
@@williamavasquez If they leave those branches on the remote, doesn't that mean the next time you pull from that repo, those branches will get created again locally?
@Dahey69
@Dahey69 2 года назад
Do you clean the tix branches from the server or do they need to stay there?\
@akodev
@akodev 2 года назад
it depends on the team, I like to clear it out of my local, some places purge branches every quarter. so its all about preference.
@chuckwalla2967
@chuckwalla2967 Год назад
@@akodev If they leave those branches on the remote, doesn't that mean the next time you pull from that repo, those branches will get created again locally?
@philfai-pp5wf
@philfai-pp5wf 2 года назад
Question abt creating the pull request at 5:28. Is the assumption here that all team members have access to this github account, hence can create the pull request from within the account UI?
@akodev
@akodev 2 года назад
Anyone can make a pull request, as long they have read access (not private repo)
@quachhengtony7651
@quachhengtony7651 3 года назад
Should I use git add . or git add -A?
@jameskulu
@jameskulu 3 года назад
git add . is used by most of the people. But you can use any.
@akodev
@akodev 3 года назад
James is correct, some people prefer -A but either one works.
@markcuello5
@markcuello5 Год назад
HELP
@akodev
@akodev Год назад
Is there something I can do to help?
@Prinjal_Boruah
@Prinjal_Boruah 3 года назад
don't know git is so confusing for me
@akodev
@akodev 3 года назад
... wanna know a secret? (I dont know what im doing! no one know!!)
@alchemication
@alchemication 3 года назад
That’s ok. Take your time and practice. Best! 😁
@tyranitarxd2819
@tyranitarxd2819 2 года назад
I found gold
@husnainabbas4407
@husnainabbas4407 Год назад
Amazing...
@akodev
@akodev Год назад
Appreciate it! Anything I can do!
@arekhandiaharry4490
@arekhandiaharry4490 2 года назад
Thank you so much. You’ve answered all my questions on collaborations.
@CarlosPereira1973
@CarlosPereira1973 2 года назад
Thank you for the nice explanation
@krishnavamshimudi6624
@krishnavamshimudi6624 2 года назад
one of the best shortest practical video explanation on github. I have seen many videos they are only theory and even some of them are not showing practical but u r video is just like begginer of the github can even understand it tq very much
@lukas7338
@lukas7338 2 года назад
why "pull origin master" when you are about to delete the branch?
@williamavasquez
@williamavasquez 2 года назад
this is so it does not cause merge conflicts with master
@bobweee888
@bobweee888 3 года назад
do you have video how to step this up?
@akodev
@akodev 3 года назад
Bob, setting what up? if you let me know we can make a video
@bobweee888
@bobweee888 3 года назад
@@akodev the entire workflow how stepup best practice for git fork pull merge for team type thing
Далее
Git Tutorial For Dummies
19:25
Просмотров 1,1 млн
Новая BMW 5 провал за 10 млн! ИЛИ?..
32:07
Git Branching and Merging - Detailed Tutorial
54:28
Просмотров 210 тыс.
5 Ways to DevOps-ify your App - Github Actions Tutorial
12:12
So You Think You Know Git - FOSDEM 2024
47:00
Просмотров 1,1 млн
Git It? How to use Git and Github
12:19
Просмотров 760 тыс.