-Begin work: pull from master of remote to master of local. To get newest changes from team - local: Make your own branch to code your features => push this branch to remote. - remote: make a pull request to admin merge your new branch to master ???
@SelfTeachMe3 жыл бұрын
That's a good summary. This is the flow that I use when I'm working on a small project -- either solo or one other contributor. But, for a lot of client projects I'm on, we'll add another layer by including a dev branch: - Pull work from dev remote to dev local. Get the newest changes from the team. - Local: Make my own branch to code features, this branch gets pushed to remote. - Pull request to merge my new branch to dev. - The dev branch is tested on the staging server - Admin / Tech lead will merge generally merge dev to master which automatically gets pushed to the production server.
@huyttvlog3 жыл бұрын
@@SelfTeachMe ok.so all members will work with dev branch. Admin will test and merge it to master on remote.
@SelfTeachMe3 жыл бұрын
@@huyttvlog That's right.
@amitozsingh30638 ай бұрын
@@SelfTeachMe what do you mean by staging server, is it like dev instance website where client can changes before moving to prod
@SelfTeachMe8 ай бұрын
That's a good question! ... Yes! On a staging server, you can preview the site and if you have clients, then they can also preview and make changes before going live. But, even if you don't have clients, it can still be useful to have a staging server so that you can make sure that your site looks right on the server. How many times have you heard, "it looks good on my machine?! 😂" A staging server should have the exact same settings that your production server has so that if there are any consistencies between your computer and the server, you're able to catch them before the world does.
@Kairat_Tech Жыл бұрын
The best real world tutorial so far. Thanks
@andrearufo2 жыл бұрын
Great short but complete video: thank you.
@SelfTeachMe2 жыл бұрын
Glad it helped
@job_mg2 жыл бұрын
Thank you for sharing. I wanna see more definitely.
@MrGawel713 жыл бұрын
I just came across this video and it's great ! It's well explained. Thanks for sharing qualitative content like this 😁
@SelfTeachMe3 жыл бұрын
Thanks for the kind words!
@OProjects3 жыл бұрын
Thank you for sharing this video. Helps me a lot.
@SelfTeachMe3 жыл бұрын
I'm so glad!
@pcelis193 жыл бұрын
Great video, and thank you for the advice. Just a heads up the the sound effects can sometimes be a bit loud. (It was noticeable in the outro) Making it hard to hear you, but other wise it was straight to the point.
@SelfTeachMe3 жыл бұрын
Pedro // thanks for the feedback. I’d be curious if you think the same about some of my newer videos. I’ve tried to be more cognizant of the levels and mixing.
@pcelis193 жыл бұрын
@@SelfTeachMe I def. will in the near future. This was a great video and I enjoyed the overall editing. Thank you for the content!
@goosesicle Жыл бұрын
Great video thanks for the tips! One thing I noticed is that the sound effects are very loud compared to your voice. I was watching this late and trying not to wake my partner but the audio was quite unbalanced so it was hard to pick a volume
@alperencode2 жыл бұрын
Thanks!
@SelfTeachMe2 жыл бұрын
You bet!
@youtubenewbie10122 жыл бұрын
How do you get your terminal to display your branches in green and amber?
@SelfTeachMe2 жыл бұрын
That comes from Oh My Zsh. Check out this video: kzfaq.info/get/bejne/esmfgbGHssWrnIU.html
@egyleader4 жыл бұрын
Good video ,,,
@SelfTeachMe4 жыл бұрын
Thanks!
@kamalchoudhary83642 жыл бұрын
Thank you for the amazing video. Though, I have a question: after confirming merge, we delete the branch on Github [08:18] , but I still see this branch when I run command "git branch -r" or "git branch" in my terminal. Can you please help me understand this?
@SelfTeachMe2 жыл бұрын
Sure! Even after a merge, you still have to delete the old branch. This is true for local and remote branches. Although, GitHub, will ask you after you merge a branch in if you want to delete it. // delete branch locally git branch -d localBranchName // delete branch remotely git push origin --delete remoteBranchName
@kamalchoudhary83642 жыл бұрын
@@SelfTeachMe Thanks for the answer. Well, I was actually saying that after confirming the merge, I clicked "Delete" button on the Github prompt that says "You can safely delete the branch". Doesn't it should have deleted the branch on remote?
@SelfTeachMe2 жыл бұрын
@@kamalchoudhary8364 Yes, clicking the delete button should delete the branch on your remote. If you can still see it when you run the git commands locally, you might need to refetch your branches.
@kamalchoudhary83642 жыл бұрын
@@SelfTeachMe Yes, it worked exactly as you described. One quick tip for future readers is that you can also use "git fetch --prune". Thank you so much, Amy!
@amitcreation67862 жыл бұрын
Please the audio quality is low
@SelfTeachMe2 жыл бұрын
Sorry about that, I've tried to make improvements since this video was posted.
@dadizalamite4 жыл бұрын
thank you sharing this video it is great please don't make the sound of the music high than your voice. and if you can don't speed up when you talking.....be slow....... .....continue............ I joined
@SelfTeachMe4 жыл бұрын
Thanks for the feedback.
@dadizalamite4 жыл бұрын
@@SelfTeachMe I will the big fan ...for you. I have issue about add collaborator to the repo.. showed me the accept link in Email , and when I click to he link it take to the git and the collaborator still awaiting......how can I solve the problem.....
@SelfTeachMe4 жыл бұрын
@@dadizalamite You're not trying to become a collaborator on the project. You either want to "Fork" the repo (button in the top right). This will put a copy of the repo on your GitHub account or click on the "Clone or download" button (green button above the repo file list). This will download a copy of the code to your computer.
@dadizalamite4 жыл бұрын
@@SelfTeachMe very usefull
@ThanksForAllMyToes Жыл бұрын
Jesus, git is complicated! I really don't understand why people like using a command line approach instead of a visual interface. So much easier to see and use.
@SelfTeachMe9 ай бұрын
Totally agree! ... I think it's beneficial to know the commands so you have the vocabulary. But, I always use Tower or the built-in tools inside VS Code