I have been wondering for a while and I have to ask, how does the “release” branch work?
It’s graph looks really weird, as if it was completely disjoint from the rest of the development: github.com/vassalengine/vassal/network
… while it should look roughly like this: nvie.com/img/git-model@2x.png
E.g. in our case, bugfixes which get into next release get PRed into the release branch, and the release branch is regularly merged into master.
Thus spake Flint1b:
[This message has been edited.]
I have been wondering for a while and I have to ask, how does the
“release” branch work?It’s graph looks really weird, as if it was completely disjoint from the
rest of the development:
github.com/vassalengine/vassal/network[1]
The release branch diverged from master at a point when I thought we
were maybe a week away from a release and there wouldn’t be many
changes to master… and then we restructured the whole build process to
use maven, were not a week away from a release anymore, and discovered
that we needed a release between what was now on master and 3.3.1.
That’s not at all what I was intending to do.
–
J.
