Thank you for nice explanation. Can you tell difference between development and master branches? And second question is the release branch actually production brunch? And how about brunch that is in the testing stage? Do we need one more testing branch in this diagram?
4 ปีที่แล้ว +1
Seems like a mixture between Git Flow and Gitlab Flow branching strategy?
In case of HOTFIX we updating in master and development branch only , why not in release branch ? If I have several release version and I have requirement apply specific release which have hotfix then ?
Hi I have question here ex. dev 1 is working on same code and dev2 is working on same code and dev 1 pushed code to the dev branch but dev2 does not that dev1 pushed his code at the time dev 2 pushed his code so what will happen here? you will conflict here right how wiil you solve the problem?
if there are multiple developers working on same repository , suppose 'developer-1' working on story id 100 he create there branch from development branch i.e 'dev', similarly 'developer-2' working on story 101 and create feature branch from 'dev'. 'developer-1' push there code to 'dev'. and next day 'developer-2' have pushed his code to 'dev. and then client requirement to push 'developer-1' to poduction immediately , How to manage this requirement because while cherry picking there are more changes above it, how to manage this thing?
Hello Dear, As per the standard process, before pushing code to dev or any other branch, a developer has to take a pull form that branch to ensure that the code is updated and there are no conflicts. Once pull is done, developer 1 or developer 2 can push their code as many times as they want. Let me know if you want me to explain it more.
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...🙌
3 releases(1.1,1.2&1.3) are completed, but I need to work on hotfix from 1.1 release. Also I need to remove 1.2&1.3 release codes from my product.what should I do in this case.
thanks for the reply sir. As a DevOps engineer do we have to decide which strategies like feature, hotfix etc needs to be implemented or the developer will take care of these strategies that which one needs to be implemented?
you are awesome man. you explained in the best way
Thank you for your support💪
Don't we have a special branch for the QA/Testing team?
Not now
But we can arrange if required
Thank you for nice explanation. Can you tell difference between development and master branches?
And second question is the release branch actually production brunch? And how about brunch that is in the testing stage?
Do we need one more testing branch in this diagram?
Seems like a mixture between Git Flow and Gitlab Flow branching strategy?
In case of HOTFIX we updating in master and development branch only , why not in release branch ?
If I have several release version and I have requirement apply specific release which have hotfix then ?
Thank you for the video, it is excellent explanation on branching strategy !!
Thank you dear, Happy learning
Thank you for such amazing explanation sir...this is what I was looking for
Thank you dear, happy learning...
this was helpful. thank you sir
Thanks dear
Happy learning
Hi I have question here ex. dev 1 is working on same code and dev2 is working on same code and dev 1 pushed code to the dev branch but dev2 does not that dev1 pushed his code at the time dev 2 pushed his code so what will happen here? you will conflict here right how wiil you solve the problem?
The developer will push code later, will have to pull the code of Dev 1 first and resolve conflicts if any
Only then code will be pushed
if there are multiple developers working on same repository , suppose 'developer-1' working on story id 100 he create there branch from development branch i.e 'dev', similarly 'developer-2' working on story 101 and create feature branch from 'dev'. 'developer-1' push there code to 'dev'. and next day 'developer-2' have pushed his code to 'dev. and then client requirement to push 'developer-1' to poduction immediately , How to manage this requirement because while cherry picking there are more changes above it, how to manage this thing?
Hello Dear,
As per the standard process, before pushing code to dev or any other branch, a developer has to take a pull form that branch to ensure that the code is updated and there are no conflicts. Once pull is done, developer 1 or developer 2 can push their code as many times as they want.
Let me know if you want me to explain it more.
could you please share the Image URL what you 're showing in demo
Okay, I will check if same I have
@@ServerGyan thanks for the kind reply..awaiting for link :)
@@mdalishaik-aliza Hello Dear, I created this image but unfortunately I remove that, Sorry.
How will it work with CI?
You need to enable git web hook for the same
Can you please list out the all git strategies..
Sure, I will try to figure out all strategies and create a video on the topic.
@@ServerGyan please send me the link for this videos.
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...🙌
TQ bro ,I m waiting for next docker videos,and DevOps interview questions?
Nice explanation
Thank you dear
sir do we have QA branch also
That depends on environment to environment
Ideally we should have branches or tags per environment
3 releases(1.1,1.2&1.3) are completed, but I need to work on hotfix from 1.1 release. Also I need to remove 1.2&1.3 release codes from my product.what should I do in this case.
Well explained.
nice tutorial
First of all thanks sir, Is Master branch compulsory ? can we apply release branching strategy without creating master branch
Master is default branch, this is created by default, you may not maintain it but always Available
thanks for the reply sir. As a DevOps engineer do we have to decide which strategies like feature, hotfix etc needs to be implemented or the developer will take care of these strategies that which one needs to be implemented?
This is collaborative decision, both Development and Devops team decide this.
Thanks @@ServerGyan
Share ppt or image of this ?
Surely, will look for this and share
worst explanations.... so much conflit ...... Dont try to make forther on branches