Git branching strategy for Agile project

0 votes

I have a project that is located in Git Stash Repository. The code will be deployed in four environments(Dev, Test, Stage and Prod). We follow Agile methodology. So dev team works for both Release activities and Non Release( Future Release) activities. I have to create branches based on this requirement. Below is my plan.

Three stable branches: master, release and develop.

master is the default branch. develop will be created from master. release will be created from develop

feature branches --> they will be created from develop. each developer has one feature branch and they merge the code into develop branch once done. so dev environment deployment will happen from develop branch.

if changes need to go Test environment, we have two ways here. one is merge the develop branch with release branch( Test environment deployment will happen from release branch). We can not implement this since develop branch may have both release and non release changes.

another one way is merge the feature branches directly into release branch. so that each developers changes can be merged into release branch. I am not sure whether i can implement this method. Can someone please tell me if this way will work? is there any alternate way to handle this situation.

branching:

master branch---> develop branch --> release branch

develop branches --- feature branch1 | feature branch2 | feature branch3


deployments:

develop branch for --> dev deployments

release branch for --> test deployments

master branch for --> stage and prod deployments

I can not merge develop branch into release branch. Since develop branch has some non- release changes as well. I need only release changes on release branch. can feature branches be merged into release branch directly? What is the best approach here?

Apr 13 in PMP by Edureka
• 9,320 points
20 views

No answer to this question. Be the first to respond.

Your answer

Your name to display (optional):
Privacy: Your email address will only be used for sending these notifications.

Related Questions In PMP

0 votes
1 answer

How do I prepare for a project manager interview?

PMP® Certification is known as the golden standard in ...READ MORE

answered Jul 23, 2020 in PMP by Roshni
• 10,500 points
290 views
0 votes
1 answer

What is Agile Project Management?

Agile methodology is an incremental and iterative ...READ MORE

answered Jul 24, 2020 in PMP by Sirajul
• 59,170 points
183 views
0 votes
1 answer

What will be the greatest challenge for project managers in 2025?

There are multiple reasons which can take ...READ MORE

answered Jul 25, 2020 in PMP by Gitika
• 65,850 points
205 views
0 votes
1 answer

Online Jobs for Project Management Professionals.

Check the Job Board on PMI Website. Careercenter.pmi.org ...READ MORE

answered Aug 4, 2020 in PMP by Kim
150 views
0 votes
1 answer

What does digitalization mean for project management?

Digitalization started long ago by using computers ...READ MORE

answered Aug 4, 2020 in PMP by Gitika
• 65,850 points
152 views
0 votes
2 answers
webinar REGISTER FOR FREE WEBINAR X
Send OTP
REGISTER NOW
webinar_success Thank you for registering Join Edureka Meetup community for 100+ Free Webinars each month JOIN MEETUP GROUP