What's been working particularly well for my team is creating a shared sprint branch.
At the beginning of a sprint, we'll create a shared sprint branch off of master.
Features branches are then created off of the sprint branch. Once the work is finished, the feature branch is immediately merged back into the sprint branch.
At the end of a sprint, the sprint branch is merged back into master, and a new sprint branch is created and based off that work.
I think this balances both worlds: one where we can work independently of each other, but also avoids costly merges at the end of sprints.
This sounds like a reasonable solution, and we too have taken a similar approach with story branches. In Continuous Delivery you can deliver multiple times inside a sprint which makes the union of Scrum and CI/CD very interesting.
Do you ever deploy the sprint branch or do you wait for it to be merged to master?
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
What's been working particularly well for my team is creating a shared sprint branch.
At the beginning of a sprint, we'll create a shared sprint branch off of master.
Features branches are then created off of the sprint branch. Once the work is finished, the feature branch is immediately merged back into the sprint branch.
At the end of a sprint, the sprint branch is merged back into master, and a new sprint branch is created and based off that work.
I think this balances both worlds: one where we can work independently of each other, but also avoids costly merges at the end of sprints.
This sounds like a reasonable solution, and we too have taken a similar approach with story branches. In Continuous Delivery you can deliver multiple times inside a sprint which makes the union of Scrum and CI/CD very interesting.
Do you ever deploy the sprint branch or do you wait for it to be merged to master?