Here's the most complex situation I'll ever face. ...
# sdf
d
Here's the most complex situation I'll ever face. 2.0.0 is out in Production. 2.1.0 is being QA'd. 2.2.0 has started development
e
@ExtendApps Inc. In my own repo, this would mean
master
is at 2.0.0, Two separate branches
release/2.1.0
and
release/2.2.0
would have been created off
master
at 2.0.0. Active dev can be going on in 2.2 while 2.1 is being tested. Once 2.1 is tested and approved, it gets merged into
master
and released per normal process. Now that means 2.2 is being worked on and doesn't include 2.1 changes yet, so
master
gets merged down into
release/2.2
to update it with 2.1, and
release/2.2
gets merged down into all its corresponding feature branches, if there are any
It definitely looks more complicated than it is in practice, and also I generally avoid this as I'm in full control and don't start a future version until the previous one has been released