The current state is as follow:
master is used to develop the next big release: MuseScore 3.0. This
development means large scale changes, making this branch very different
from 2.X ones.
MuseScore 2.0 has been branched out of master long time ago. The 2.x
releases were all developed in their own branch, created one from the other
in this order 2.0 > 2.0.1 > 2.0.2 > 2.0.3 > 2.1 > 2.2.
Most of the development happens on master and if necessary, I cherry pick
commits from master into the current 2.x branch. Eventually, contributors
can make a PR toward current 2.X branch if the fix is specific to this
branch and not related with master at all.
If we move forward and make a 2.2 release in the coming months (see the
other thread), master and 2.2 branch will become the two active branches.
Most of the bug fixes will be done in master and adapted to 2.2, others
will be done specifically in 2.2. If you want to help the development of
the next version, then you better build branch 2.2. If you want to look
into the future, then build master.
lasconic
2017-05-24 23:13 GMT+02:00 Bernhard Landauer <obe...@manjaro.org>:
> I have been following musescore development for quite a while now and am
> also maintaining the git package in the ArchUserRepository.
> What I would like to understand and was not ableto figure out myself is,
> how do your branches relate?
> On the graph on github it looks like the 2.1 branch was never recently
> merged with master and a compare shows that they are quite different and
> far from mergeable...
>
> For me it would be really interesting to understand how this works
> especially from the POV of someone who has always been trying to run
> git-master if possible - partly in the hope that bugs would have been
> fixed and partly to maybe be of help for the development by finding and
> pointing out issues.
>
> Now I see that you have started fixing 2.1 bugs on a new 2.2 branch - so
> it looks to me like, if I want to use a bugfixed version it's not master
> branch that I should use but rather 2.2 branch.
> But then again I don't understand how the bugfixes will be integrated
> into master.
>
> I'd really be thankful for some explanation here
>
> Thanks a lot
>
> with kind regards and thanks for your work
> Bernhard Landauer
>
>
> ------------------------------------------------------------
> ------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> _______________________________________________
> Mscore-developer mailing list
> Mscore-developer@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mscore-developer
>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Mscore-developer mailing list
Mscore-developer@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mscore-developer
