Lukas it depends on the issue. if they are working on enhancements and new features the master branch is used. if its a bug fix for 1.0 then the stable branch should be used.
On Sun, Mar 30, 2014 at 2:36 PM, Lukas W. <[email protected]> wrote: > Hi, > > Thanks for pointing this out, it still needs to be updated. > Before I correct this, I'm still unsure what the planned workflow is: > Should devs base the work on the unstable master branch or the > stable-1.0 branch (for bug fixes)? > > 2014-03-30 14:28 GMT+02:00 midi-pascal <[email protected]>: > > Hi, > > > > I just noticed in the Wiki page "Submitting-a-patch": > > > > 4. Pull in upstream changes > > > > .... > > > > $ git fetch upstream # Fetches new changes without modifying your files > > $ git rebase upstream/stable-0.4 > > > > Ithink it sould now state: > > $ git rebase upstream/stable-1.0 > > > > I thought doing the change myself but there is no "Edit page" anywhere in > > the page so I could not do it. > > I think this is somewhat important to avoid people submit their patch in > the > > wrong branch :-) > > > > Thanks > > > > > > > > > ------------------------------------------------------------------------------ > > > > _______________________________________________ > > LMMS-devel mailing list > > [email protected] > > https://lists.sourceforge.net/lists/listinfo/lmms-devel > > > > > ------------------------------------------------------------------------------ > _______________________________________________ > LMMS-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/lmms-devel > -- Jonathan Aquilina
------------------------------------------------------------------------------
_______________________________________________ LMMS-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/lmms-devel
