Day-10 | Git Branching Strategy | Real World Example | DevOps Interview Question|
ฝัง
- เผยแพร่เมื่อ 15 พ.ค. 2024
- Support my work
www.buymeacoffee.com/abhishekprd Hi Everyone, Today is Day 10 of Free DevOps course and In this class we will take a look at the a real time project to understand about Branching Strategy in Git. We will look at Kubernetes repo in GitHub and understand how they are dealing with branching in GitHub.
If you haven't watched our previous videos on Shell Scripting please take a look at the below playlist:
• Shell Scripting for De...
Telegram channel
===============
t.me/abhishekveeramalla
About me:
-----------------
LinkedIn: / abhishek-veeramalla-77...
GitHub: github.com/iam-veeramalla
Medium: / abhishekveeramalla-av
TH-cam: / @abhishekveeramalla
Thanks a lot. very well explained with examples.
Grateful😇 Thankyou Abhishek
This channel is Gem for Devops mastering, I appreciate your efforts, Good work!!!
Thanks a lot for making this video Sir. It was superb with real world examples ❤
It's truly fantastic to have the opportunity to learn the DevOps course with real-world examples, which are often not offered by other institutions. Thanks Abhishek 😊
Awesome, got you. It's easy
Thank you Abhishek 🙏
Thank you so much abhishek ...actually now I came to know about your channel but it was really good and very simple way to understand your all concepts definetely i m going to watch all devops videos ,u are done great job thank you so much again lots of gratitude🌸
great explanation .
Thanks ,its Clear concept.
Thank you Sir, I got the same question and explained exactly, though am working i didnt had this much idea,it is realy helpfull..
Completed day -10 successfully
Great video :)
Day-10 Completed successfully :) and Thank you Abhishek :) .
Abhishek sir, you can also put contribution for your effort. We can contribute some amount for you. It's for our satisfaction. If anyone wants to contribute, they will do. Because every institute will charge a lot of money. But you are teaching without fee.
Thanks for the feedback.. Right now the intention is to not charge from the students :)
But because many students are asking .. I will check what is possible :)
Very Helpful!😍 Thank you So much
Abhishek Sir, we are on our way please keep making videos don't lose motivation in future this playlist will be one of the best tutorial on TH-cam trust me.
Awesome. Please share the videos with your friends
Best
Thanks Bhai!
Go On.
Thanks
Thank you ^^
Wonderful explanation!! Truly thankful 👏
Glad it was helpful!
Thank you so much for this video, got my concepts cleared related to branching strategy
Great to hear!
Very nice explanation Abhishek bro....Keep on rocking the knowledge sharing...my lovly kudos to u
Thanks a ton
Great explanation Sir.
welcome
Hi Abhishek excellent session. Thanks for brushing up my git knowledge.
My pleasure
🙏🙏🙏❤ for ur dedication and teaching
It's my pleasure
Thanks for explaining the branching strategy. Could you please explain how this branching strategy to be used for deploying applications in various environment such as Dev, Test, production environment etc..
Superb, thank you
Welcome 😊
awsome
Thank you ❤️
Master(main branch for), feature branch for added functionality. Release branch for delivery to customer, instead of building application from master we build and deliver to customer from release branch.
Master branch is for active development. Master branch can be for testing.
Thank you Abhishek, it's very clear
You're most welcome
Thank you so much. The explanation is fantastic and helpful. You are gonna be my mentor..
Happy to hear that!
Learned something new about Git which I was unaware of until today.
Awesome
Well explained 😊 thanks
My pleasure 😊
Awesome. Please share the videos with your friends
i completed this video abhishek
Beautiful Explanation 👍👍👍👍👍
Thanks and welcome
Thanks a lot. your doing great job . I appreciate your efforts , I tell you bottom of my heart.👍👍
It's my pleasure
Thankyou for the stuff but if you have showed practically that will help a lot more to the people....TQS bro
This is pure gold
Most welcome !!
Good explanation abhishek keep it up 👏👏
Thank you so much 😀
Content was really good 👍
Thanks
Thank You Sir! Learnt something new !
Glad to hear that!
Completed Day:10 Video and Practice also done.
Thanks Veeramalla garu
GK from NJ
Thanks a lot !!
Great Uber example, Explained well.
Thanks !!
Thank you so much abhi sir, got the complete understanding of the concept.
Completed this Video on 29th June 2023.
❤️❤️
Thank you so much sir you are doing really great thing. Outside other institute charge for devops to learn many of the students who want to learn devops they are not able to learn devops because they can't afford fees that much but you are teaching free so that they can learn really it's great thing sir. Thank you so much once again.
It's my pleasure
so far the best video available on YT...thanks bro u r a savior...could u plz add or show how this branching strategy works in Jenkins as well?
Thanks alot
Thank you bro, Very helpful.
Thanks a lot
Completed 10 days course.
Thanks Abhi.. Clearly understood 😊
My pleasure 😊
Thanks so much sir you’re doing a wonderful job
It's my pleasure
nice
Thanks
Thanks a lot. This is really good. I finally got it.
Glad it helped!
Hi Abhishek veeramalla I had just started exploring your playlist, you are simply an amazing mentor
Thanks a ton
Really love like video. It is easy to understand, and I now have some clarifications on some things I was confused about. God bless you for this effort
Thanks a lot
Thank you sir
Welcome
You are God of devops sir
❤️
Awesome content, keep it up Abhishek...Love and respect from Pakistan.
😍
hi sir, thanks for your time to guide us!
This what i understand.
The default branch we call it as master branch.
under the master branch will be another 2 sub-branches 1.development branch and 2. release branch.
1. development branch --> we create an feature branches as per the devlopers team size.
2. release branch --> through this branch will release to production.
if bugs in prod. will create the hot-fix branch under the release branch.
Thanks.
Awesome. Great learning Akhil
Hi Abhishek, Thanks for the explanation , However how would be this scenario looks if we have like Dev, QA,Stageing and Prod servers?
hot-fix branch is created for quick bug fixes or adding quick features ,and then it merge in release and master branch to kept it up to date .....am i right sir....plzz reply to me sir
Super anna....Neet ga explain chesaru.
😍
Hi Ahbishek,
It was really amazing if you had chance to do video on complete real time pipeline using groovy to deploy in qa uat prod with the help of jenkins shared library so that i t would be very useful to crack any devops interview
Sure
Hope that today it 'll be practical session of branching strategy.
Hope you enjoyed video
@@AbhishekVeeramalla yeah bro
Abhi shek now iam thinking why i didnt find you one year back. Now i got to know your lectures one year back i took a course from intellipaat , those guys also not taught like this
Eureka is superior than those
@@Cloudnp9458 then y u r watching here
Thanks Shiva ❤️
Hi Abhishek, hotfix branch created from which branch ? is it from Release branch or Master branch ?
Thanks
Thanks alot Upendra
Hey, Abhishek, very helpful videos and nice clear explanation on GIT branching strategy. I used to work as Front-end developer mainly when pushing codes, I used to face problem like let's say Dev 1 is working on feature "xyz" and Dev 2 is working on another feature but dev2 is dependent on Dev 1 feature does Dev 2 needs to wait until Dev1 finishes developing feature? Or dev 2 can go head and create separate branch / same branch as Dev1? and start working on developing feature Dev2 pull code after Dev1 finishes and everything has been pushed faces lot of Merge conflicts? how to avoid Merge conflicts? any Git commands to check before avoiding merge conflicts?
Like in feature branching strategy, what actually master branch is referencing to the tip of latest commit ?
Hi Abhi It was a greatest stuff I could say. And I would like to thanks a lot. Are you sure this course will definitely will add a clear demo of What's involved in DevOps. I would like to thank you a lot for you initiative to support many for free.
Thanks alot .. Yes Sharif .. complete the course and you will get clear understanding of devops
sir can you please explain the difference between trunk based and gitflow branching stratergies
you r god of devops
❤️
❤
Good content brother, it will be very helpful if you privide notes{your content and interview question and answers} also .
Ok next time
Hi Abhishek Sir,
@18:19 in the Uber example, will the 'feature-bike' branch be merged into the latest master branch or into the master branch from which it was originally created?
Hello Abhishek, thanks for the video. Great content as usual. I have a question though, Is it mandatory for every hotfix branch to merge into master, sometimes release1.0 branch could be behind main branch by some commits and the fix might probably be only relevant to the hotfix branch, in this case(if it exists) does the hotfix branch still gets to master/main?
@venkatabhilash The answer is yes, As we created the release branch from main / master, the bug does exist in the main / branch. So we have to commit the same fix to the main branch as well.
Just a quick question - Release branch would most likely would have just commit that is common to the master branch commit where one decides to branch for release. No further commits would go in Release branch from that point forward and new commits would go to dev branch (main/feature) and later on new release branch would be created when ready for release? Is my understanding correct? Thank you for these videos Abhishek.
I am watching from Noida Delhi ncr
Thanks
hey @AbhishekVeeramalla , how can i open my git terminal like you?
Hi @abhishek can you please update the github documentaion via github repo
Day-10 done ✅️🙂
Keep Going..
Thanks 🙏 so much. But I have one doubt to clear, how would you compare main, dev, staging and uat branches to main and releases branches covered in this video? Keeping in mind that feature and hotfix branches are common to both?
Thanks once again. You are a healing to many
Most welcome !!
Hi Abhishek, Can I use the same branching strategy for windows application? Generally we follow branching strategies like dev,qa,pre-prod and prod. Let's say qa is our release branch which is going to customers? Then what is the use of pre-prod and prod(master)?
You can follow same branching strategy
Hi Abhishek sir, can you help me aws code commit, how to restrict merge of branches created from other main branch like if I created branch from sit it should be allow to merge on sit only and not on any other branch
Hi Abhishek, how can specific people merge their changes directly to the master branch rather than raising pull request. This was the question asked in the interview. Could you please answer this.
No one should merge changes directly to master branch , it is a bad practice.
If you still want to do it, you can disable the branch protection in the repo settings.
Hey abhiskeh can you provide the roadmap
Thanks once again Abhishek, could you suggest which is the bes strategy ? i heard names like Git flow strategy /Git hub flow strategy/ features branching strategy?
We discussed about Git flow strategy in our video am I right?
Yes, you are correct
Hello Abhi, You are saying from hotfix code should get to master 1st and then release branch. But what about Develop branch ? From hotfix code should get to merge to develop branch after Master branch right and not to release?
From develop beanch we are creating release branch to release the changes to prod env. If if the changes from hotfix is not on the develop branch then how can we relase the code to prod env ?
you meant multi branching for microservices application according to your explanations. Right?
Hi Abhishek, thanks for the sessions.. in the previous videos u told abt the github test repo. while practising, i found some other options in GIT.. desktop app o GIT.. how is it diff. can we use the desktop app as well.. please make me understand. TIA😊
Yes u can use that as well
Does the master branch and latest release branch have the same code? Bcuz at last both are the having latest code.
Hi @Abhishek, have been following your DevOps tutorial and reffered to friends as well to get knowledge from best place. Currently following the same branching strategy for my client, however application requirement here is to rollback to last two successful release version (N-2) instead of previous version. In this case could you advise, how to manage release branches or tags to use please.
I can help you, but I will charge you 1000 rupees hourly.
Abhishek,could you just show a practicals on merge and rebase.
For sure
hi bro if possible can you please do Realtime hands-on videos so its help full to us
Ya sure .. will do more
It’s very clear and perfect explanation thanks abhishek
I have one small concern so the organization when ever a product is ready for a customer phase they create a release branch and they go ahead for release and then they keep updating the master branch whenever they are ready with other version again they create release branch and then host it so that they can continue testing and do improvements on master branch..
so according to this video there might be more than one release branches right ?
This is what I understood if I am wrong please correct me !!!
I will be waiting for your response
Thanks in advance!!!!
Yes there will be multiple release branches
so I have a doubt, so will release branches eventually merge into master branch? and is release branch is extracted from master branch or feature branch?Thanks
Hi Abhishek ,
I have a doubt,
Now Main /Master branch is running ,if customer come and request us to change something we will create the feature branch and work & merge with master branch code(release branch V2)
Again if customer come and request us to change something we will create another one feature branch and work & merge with master branch code .
My question is whenever we change something in feature branch and merge with master branch, will it automatically update & release or until /unless we create release branch (V3) ,will it save as incremental code with master branch? I hope my question is clear...
great seesion, thank you. I have one query - In github should we need to create hotfix branch from release branch or master branch?
Release
What if there is Prod issue on Release Branch, and Master also has same code ?
Hello, Thanks for the great video. I would like to know new versions are only deployed from Release Branches? Main branch is not used for deployment? Is main branch only for maintaining all codes of versions?
Release branches, yes.
Main branch is for active development
@@AbhishekVeeramalla Got it. Thank you!
Hello Sir! waiting for Day11
Please wait.. uploading..
❤️ . ( I have a question I'm planning for AWS cloud practitioner and Azure az-900 exam, I'm actually preparing for it. Will it be helpful for getting jobs?)
Yes, definitely