Hi,

2014/1/10 Jonathan Aquilina <eagles051387@gmail.com>
I think from now on we should adopt the mentality that all patches should be based against the master branch

To be clear: not the old master branch but either a new one we're going to create or even better: stable-0.4! Otherwise the patches won't apply.

IMHO we should go away from the concept of stable and development branches. Instead there should be one branch where stabilized feature branches get merged in. Every N weeks there should be a release. Of course we can still provide an experimental branch where all feature branches regularly get merged in (for users wanting to use bleeding edge unstable LMMS) but development should not happen against this experimental/master branch.
 
and then cherry picked to the branches upon approval by someone such as toby and Paul (pgib on irc)

Based on the experiences in the past, we should try to avoid cherry-picking and use feature branches instead to make sure the code base is not diverging and merging is always possible without conflicts.

Toby