GIT 3 Branching Strategy | Github and GitLab Branching Strategy

GIT 3 Branching Strategy | Github and GitLab Branching Strategy | Must know for all engineers

Рет қаралды 21,953

Concept && Coding - by Shrayansh

Жыл бұрын

Join this channel to get access to perks:
/ @conceptandcoding
#github #softwareengineer

Пікірлер: 39

@haider.memories Ай бұрын

Perfect explaining. Thanks!!

@swaroop.aaleti 5 күн бұрын

Nicely explained. Thanks

@prasenjitsutradhar3368 Жыл бұрын

Looking for Branching Strategy for a long time......thanks a lot!

@ConceptandCoding Жыл бұрын

Hope you will find this video useful

@nikrajput3512 Жыл бұрын

Hey Shrayansh ,You had told that you won't make other than Interview questions as private .But you made one of the most important topic : Concurrency Handling as Members only .This is not fair yaar

@vishalghanghav748 Жыл бұрын

Oh ,is that video uploaded .I thought he is still creating it. Before he had informed that it would be public

@nishantvishwanadha2912 9 ай бұрын

Thanks a lot for detail and pictorial explantion

@ConceptandCoding 9 ай бұрын

Thanks

@kcchennupati Жыл бұрын

6:52 I think we need to merge hotfix version(v1.1) from master to develop branch(v2) as well when we are back merging to release branch(v2) or back merge release (v2+hot fix) to develop (v2).otherwise if a new release(v3) is created from develop(v3)..it might have lost hot fix update(v1.1).

@ConceptandCoding Жыл бұрын

Right, whenever we start release process, always compare relase with develop, if there are any new changes present, first do back merge.

@heygokul 8 ай бұрын

Well explained. Thanks!

@ConceptandCoding 8 ай бұрын

Thanks

@Lokesh-el4mx 3 ай бұрын

❤🎉

@lavishkeyboard Ай бұрын

Hi, My question is that suppose have V1 feature on all the branches. Then we develop a new feature on V2 on dev and push to release V2. After that develop a new feature V3, V4, V5 and Pushed to Release. Now the Dev and Release branch are synched. But now, we want to deploy only feature V3 from Release to Production. How to do that without creating hotfix. Thanks in advance

@shm8296 3 ай бұрын

how the dev branch take the changes to QA branch through pr? or git merge?

@AshishGusain17 Жыл бұрын

Hi Shrayansh..thnx for the video. Query: Is the only use case of master branch is when we get a bug in prod and regression testing is going on in release branch?

@ConceptandCoding Жыл бұрын

This is one of the use case on top of my mind. But let me think for more usecases

@theSDE2 10 ай бұрын

This is awesome. Shreyansh can you teach us what is the ideal way to do a bug bash in the team for our application or just for the Backend.

@ConceptandCoding 10 ай бұрын

Thanks, sorry I did not understand the question properly

@theSDE2 10 ай бұрын

@@ConceptandCodingSo generally after we have built some features in team, then we follow some testing of our features. With respect to that I have seen teams doing BUG BASHING. I wanted to check if you know how it should be conducted?

@alen740926 8 ай бұрын

thanks - when we create the hit fix branch out of master branch for production issue- where/ which environment are we testing the "hot fix" before pushing to production again? given Dev & lower environments has exsiting new features being tested?

@ConceptandCoding 8 ай бұрын

Hi alen, thanks for the super thanks. Means lot to me. Once we have created the hotfix branch out of master, we can test it on stage environment (QA) In stage environment, you can deploy the component which you want to test and run your FT or particular scenario from postman and get validate it.

@alen740926 8 ай бұрын

@@ConceptandCoding thanks for replying- so based on your input - in that case - does QA contain both new features (version 2,3 being tested) + hotfix code? or ONLY the hoxfix code? (version1 +hotfix code) - will this interupt the regression? and what if there is conflict between hotfix and new features?

@ConceptandCoding 8 ай бұрын

@@alen740926 regression is happening with Release branch manifest(which has feature 1 and 2) and Hotfix is happening with Live changes + Bugfix changes. Release regression can go in parallel with Hotfix manifest regression

@alen740926 8 ай бұрын

@@ConceptandCoding so basically - use hoffix branch to manually deploy into QA environment (obviously we need to cooridnaten with developers to not push any other changes to QA during that time) while regression can still be going-on in UAT/release branch...? and once verficition is done in QA then we can use hotfix branch for production issues...

@ConceptandCoding 8 ай бұрын

@@alen740926 i see some gap with the understanding of QA environment. Feel free to ping me on LinkedIn, we can have a quick call and sync up on this.

@ragupathia2316 3 ай бұрын

excel

@anilsahu5709 Жыл бұрын

Hotfix back merge to Release might impact regression

@ConceptandCoding Жыл бұрын

Nope, the usecase where we merge hotfix (or in this case say bugfix) in release when new build is in Live and during monitoring we find an issue, and we want to fix on top of that new release only. Till backmerge is not done, new release and regression can not start.

@motivation_hubPJ Жыл бұрын

Thanks a lot for the video . In our org we don't keep release and master separate . Mine is not MNC though. But i feel there are certain advantages for the same. First in case multiple teams are deploying in prod in same day then it becomes difficult to monitor to separate release version on prod. Second in our org we have restrictions on which branch can be deployed in prod . We can only deploy master in prod. This helps to maintain consistency . Also it becomes easier to find out what is the diff btw code in prod and qa envs. Lastly on the point of hot fix. we do have a lot of hotfixes but usually we don't face problems with same because any hotfix will be merged via pr and the code diff will always show the changes. Not sure if this is a correct way but is working for know. Please let me know your pov on this or why it may not be a approach . Also Shreyansh if possible can we have a community channel of discord /slack . Have a lot to discuss with you 😅. Thanks again for all your informative video.

@ConceptandCoding Жыл бұрын

:) thanks for the details. I have the telegram group, pls check the channel home page top right corner

@Akash-Harale 8 ай бұрын

bro is there any vacancy for a MERN stack developer in your org?

@user-pc1pm1vb7p 5 ай бұрын

how trunk based deployment strategy works then ?? can u please tell

@ConceptandCoding 5 ай бұрын

ack

@yuvhrajverma9665 Жыл бұрын

Sir till when are u planning to complete ur system design course, it would be really helpful if u complete it early

@ConceptandCoding Жыл бұрын

I am working toward it buddy, will complete it as soon as possible

@yuvhrajverma9665 Жыл бұрын

@@ConceptandCoding ok sir

@vishalghanghav748 Жыл бұрын

Interview on Monday .Concurrency ka video aa jaaye to maja aa jayega

@ConceptandCoding Жыл бұрын

let me work this weekend buddy. Or pls ping me on linkedin, we can discuss for 15, 20 mins, if you have any doubts with concurrency, hope i would be able to answer those. Good luck for your interview.