Hotfix branches are a lot like release branches and feature branches except they're based on main/master instead of develop/dev. It's kind of the same thing but here, in this context, Hotfix branch is the better word for it.
Hello ravish, Please make 1 short video on "How Branching strategy work in DevOps" From dev to prod? How did it work? Do we have separate - separate branches Or the same master branch goes from Dev to prod.. I am a lot more confused at this point...🙌
Thanks for your feedback, Manikandan. Amazing! Glad to see my subscribers are that smart who can understand a concept in 2 minutes instead of 10 mins. Really proud of you, best wishes from my end ☺️
Hello sir, Please make 1 short video on "How Branching startegy work in Devops" From dev to prod ? How it work ? Do we have separate - separate branches Or same master branch goes from Dev to prod.. I am lot more confused in this point...🙌
FB Branch (Bug fizinf) once developed fixed, it has to be tested on staging environment and approved . Supposed same time staging environments already testing another FB, so how could you make the decisions?
Great! That can be one strategy. But, if you roll back there could be a few functionalities that won't be delivered in time. Always make sure that if the impact of the bug is not serious and you can fix it in time. Do not rollback in that condition. If you plan to roll back, just do the deployment of the previous release or the tag that you created for the previous build.
You didn't cover separate customers into canary environment and how those are merged deployed if issues to switch also single tenant db or multiple tenants db in your company if using canary prod environments to separate customers how is it configured in config values
1) Hotfix branch should be taken from release/master branch. 2) Issue should be fixed and merged into master/release branch. 3) Back merging should start from release/master/main 4) Checkout this video for more czcams.com/video/gpxvoPETVMo/video.html&ab_channel=LogicOpsLab
seriously ? feature branch from production branch ? in live env this never happens. during these scenario, fixes/bugs need to start from dev branch and then streamline to stage then QA and finally release to Prod. thats the reason all versions are not ready for production.
Exactly! That's the point. Every company has their own choice of names. You can use any names. Pre prod, UAT, test, integration are the common ones. But, the idea remains the same.
Hello sir. I am second yr ECE undergrad. I am exploring DevOps and people are telling me there isnt much scope for freshers in DevOps . should I drop the idea of learning DevOps ? As my sole plan for learning devops is placement
I have a small doubt...May be a silly one. Let's say I forked the prod branch to my own feature branch , fixed the bug and raised a MR to the prod...if the MR is approved it will go and deploy that in prod directly, but it won't be tested in dev and stage...is that a recommended method? Because it can be risky
Exactly! Also, you can't fork the branch, you have to create a feature branch. Which I think you meant already. Once the testing is done and code gets deployed to the production, it's your responsibility to back merge that piece of code into lower branches.
@@LogicOpsLab but my question is if u do not test the code in dev and stage first then again some issue can come in prod , because we are directly deploying it in prod...I hope I m making sense
hi i am a rookie in all this things.... but just wondering if we can merge the bugfix to dev without merging with stage... will that create a problem because in any case we will be pusing it to stage from dev before we finally merge it with prod?
You can take a feature branch from Dev, test it, merge it to Dev. Promoted the same to Stage, test it. And, then it goes to the production. That's possible, too.
@@LogicOpsLab hey.... thanks for your reply.... that helps.... and you have no idea what a fantastic job you are doing of helping people like us who are groping in the dark....
My doubt, how will you replicate that X' change from production to stage, then stage to dev for syncing.. What is the command or process of maintaining x dash changes across all branches pls help bro
Can't we hotfix branch rather than using feature branch?
Hotfix branches are a lot like release branches and feature branches except they're based on main/master instead of develop/dev.
It's kind of the same thing but here, in this context, Hotfix branch is the better word for it.
Can u tell me where is branching strategy video in playlist
Hello ravish,
Please make 1 short video on "How Branching strategy work in DevOps"
From dev to prod?
How did it work? Do we have separate - separate branches
Or the same master branch goes from Dev to prod..
I am a lot more confused at this point...🙌
This is the best crystal-clear tutorial I've seen on this topic. Thank you for the detailed explanations and step-by-step instructions!
Appreciate it, Nidhi. Thanks.
thanks for explaining this scenario, especially "Back Merge".
Appreciate it Ravi, thanks.
Watched so many tutorials , read so many article articles on branching strategy, but no resource explained it as clear as this one. Thanks!
Means a lot, Kavita. 🙏🏻
Then you have not properly look for better videos
I am new to devops and I was struggling, but this gives me clear understanding. Thank you !
Connect with me on LinkedIn.
@@LogicOpsLab I have sent you a message. Request youto check.
@@LogicOpsLab Hi I have messaged you in linked. Please have a look, Need some guidance
Thank you so much dear bro.. Watch this and understood... How to drag a 2 mins to 10 mins..🤭
Thanks for your feedback, Manikandan.
Amazing! Glad to see my subscribers are that smart who can understand a concept in 2 minutes instead of 10 mins. Really proud of you, best wishes from my end ☺️
Thanks...please do more videos on real time issues....Waiting for the next video...
Thanks for the support, Samy!
Hello sir,
Please make 1 short video on "How Branching startegy work in Devops"
From dev to prod ?
How it work ? Do we have separate - separate branches
Or same master branch goes from Dev to prod..
I am lot more confused in this point...🙌
From 2:08 I have explained the branching strategy.
Keep it up...waiting for more such video
Thank you, Abinash!
I cleared all my doubts.... please 🙏🙏 nicely explained
Thanks, Jalandhar.
Very very well explained 👏 👌 👍 thank you so much
Most welcome 😊
You explained very well! Nice content as always!
Much appreciated, Prerna.
Thanks for publishing this. Great work.
😃
crystal clear explanation 🙌
Thanks a lot, Prasanna.
Very informative video.. Ravish bro 👍
Thanks a lot for your support
Thank you for very detailed explanation
Glad it was helpful!
what about bugs in stage branch ? What is the origin for BugFix branch in this case? thank you!
Thanks 👍
Glad you liked it
Thanks a lot. please make similar video more
Yes, for sure. Please keep supporting.
Very well explained, how we do create these multiple environment like dev , stage and prod . Do u have some video on this ?
Not yet but will create soon.
@@LogicOpsLabwaiting
FB Branch (Bug fizinf) once developed fixed, it has to be tested on staging environment and approved .
Supposed same time staging environments already testing another FB, so how could you make the decisions?
Didn't get you, can you please rephrase your question?
Waiting for your videos
Will release them soon.
Excellent video
loved it
one query can we have something real time basis on jenkins pipeline with scripting involved in it.
It is already there. Check out the Real Time Projects, the 1st and 2nd project are exactly what you are looking for.
Awesome. Ty
You're welcome
Good Explanation. One doubt what if we follow roll back / revert strategy here?
Great! That can be one strategy. But, if you roll back there could be a few functionalities that won't be delivered in time.
Always make sure that if the impact of the bug is not serious and you can fix it in time. Do not rollback in that condition.
If you plan to roll back, just do the deployment of the previous release or the tag that you created for the previous build.
Informative video for beginners
Thanks a lot, Rahul.
Thanks for the good content, please clarify me what do mean by release branch ?
Thanks for the support. A release branch in some case is the master branch through which you release the product to the market.
@@LogicOpsLab thanks for the replay Rawwish .
Once you create a hotfix branch on which environment are you going to test it?
Ideally, you should test it on Dev then Stage and then Production, so that you don't break anything else.
You didn't cover separate customers into canary environment and how those are merged deployed if issues to switch also single tenant db or multiple tenants db in your company if using canary prod environments to separate customers how is it configured in config values
Thanks for the feedback, do let us know your approach and the scenario. We'd love to know it.
@@LogicOpsLab in your company all customers are in one prod?
Hello 👋, what's the name of this branching strategy if asked? Thank you. Great video 📹
A branching strategy is a set of rules developers follow when they write, merge and deploy shared code. This one is known as GitFlow.
Hi, thanks for the video. just wondering backmerge should be done from hotfix branch or from main branch?
1) Hotfix branch should be taken from release/master branch.
2) Issue should be fixed and merged into master/release branch.
3) Back merging should start from release/master/main
4) Checkout this video for more
czcams.com/video/gpxvoPETVMo/video.html&ab_channel=LogicOpsLab
seriously ? feature branch from production branch ? in live env this never happens. during these scenario, fixes/bugs need to start from dev branch and then streamline to stage then QA and finally release to Prod. thats the reason all versions are not ready for production.
I hope this helps czcams.com/video/gpxvoPETVMo/video.html
Thanks for the video
Means a lot, Kiran
Nice work.
Cheers!!
Can we called stage branch as test env or pre-prod env
Exactly! That's the point. Every company has their own choice of names. You can use any names. Pre prod, UAT, test, integration are the common ones. But, the idea remains the same.
Hello sir. I am second yr ECE undergrad. I am exploring DevOps and people are telling me there isnt much scope for freshers in DevOps . should I drop the idea of learning DevOps ? As my sole plan for learning devops is placement
I have also sent you a connect request on linkedin. Would love if you accept it :)
Accepted! Drop me all your queries in the DM, please.
@@its__aakashg_ wots his linkdin I'd? I searched alot but couldn't find it
Nice video bro
Thanks for the visit
Please make more videos...
Sure, will try my best!
I have a small doubt...May be a silly one.
Let's say I forked the prod branch to my own feature branch , fixed the bug and raised a MR to the prod...if the MR is approved it will go and deploy that in prod directly, but it won't be tested in dev and stage...is that a recommended method? Because it can be risky
Exactly! Also, you can't fork the branch, you have to create a feature branch. Which I think you meant already.
Once the testing is done and code gets deployed to the production, it's your responsibility to back merge that piece of code into lower branches.
@@LogicOpsLab but my question is if u do not test the code in dev and stage first then again some issue can come in prod , because we are directly deploying it in prod...I hope I m making sense
@@abhikroy4620 You can test a specific branch in any environment. So, you MUST test it before pushing it into the production.
@@LogicOpsLab thanks a lot for clearing it out...🙏
You said link in the description but it's not there.
Can you please tell me the timestamp?
@@LogicOpsLab0:45
Can't we make the changes in dev branch then do cherry pic
If you follow this strategy, then there's no point in cherry picking. Just go forward and push the changes to other branches.
hi i am a rookie in all this things.... but just wondering if we can merge the bugfix to dev without merging with stage... will that create a problem because in any case we will be pusing it to stage from dev before we finally merge it with prod?
You can take a feature branch from Dev, test it, merge it to Dev. Promoted the same to Stage, test it. And, then it goes to the production. That's possible, too.
@@LogicOpsLab hey.... thanks for your reply.... that helps.... and you have no idea what a fantastic job you are doing of helping people like us who are groping in the dark....
@@ganeshshenoy563 Means a lot, Ganesh!
Hey ravish i am also new in devops I don't know where to start are you devops engineer or developer I can't clear some concepts could please help me.
Sure, please connect with me on LinkedIn
i need full interview preperation
Please go through all the questions in the video. There are 25+ videos, that's all you need.
My doubt, how will you replicate that X' change from production to stage, then stage to dev for syncing.. What is the command or process of maintaining x dash changes across all branches pls help bro
The process is called Back Merging. You raise PR in a reverse order in this scenario.
@@LogicOpsLab ok u mean to say pr raised to merge from prod to stage.. Then prod x' to dev branch so all will be sync 😗😗😗
Yes, Back Merge
Can you make dedicated videos on kubernetes
Started a series, will update it more frequently.