DEV Community

Discussion on: My preferred merge strategy for Pull Requests

 
realsaxondale profile image
The Real Saxondale

We have two development branches at most times, a branch with only critical fixes (next), and a development branch with it all (nextnext).

All work branches from develop, but only a few of those go to develop and turn onto the next release branch. We obviously can't merge development branch, as it's got stuff we don't want, and branches are deleted when they merge to development branch.

The only other way would be two pull requests. One to develop and one to next, but that is not without its problems either.

Thread Thread
 
hoelzro profile image
Rob Hoelz

Interesting - thanks for the insight!