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

Appreciate it, Nidhi. Thanks.

Appreciate it Ravi, thanks.

Means a lot, Kavita. 🙏🏻

Then you have not properly look for better videos

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

Thanks for the support, Samy!

Thank you, Abinash!

😃

Much appreciated, Prerna.

Thanks a lot, Prasanna.

Thanks, Jalandhar.

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 ☺️

From 2:08 I have explained the branching strategy.

Thanks a lot for your support

Most welcome 😊

Glad it was helpful!

Will release them soon.

Yes, for sure. Please keep supporting.

Thanks a lot, Rahul.

Not yet but will create soon.

​@@LogicOpsLabwaiting

It is already there. Check out the Real Time Projects, the 1st and 2nd project are exactly what you are looking for.

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're welcome

Glad you liked it

A branching strategy is a set of rules developers follow when they write, merge and deploy shared code. This one is known as GitFlow.

Cheers!!

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 .

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 kzfaq.info/get/bejne/ndaoqdKBqrq6faM.html&ab_channel=LogicOpsLab

Ideally, you should test it on Dev then Stage and then Production, so that you don't break anything else.

Means a lot, Kiran

Didn't get you, can you please rephrase your question?

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.

I hope this helps kzfaq.info/get/bejne/ndaoqdKBqrq6faM.html

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

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?

Thanks for the visit

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

Sure, will try my best!

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!

Can you please tell me the timestamp?

​@@LogicOpsLab0:45

Sure, please connect with me on LinkedIn

Please go through all the questions in the video. There are 25+ videos, that's all you need.

If you follow this strategy, then there's no point in cherry picking. Just go forward and push the changes to other branches.

Started a series, will update it more frequently.

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