Just trying to get myself straight for going forward. maint is now for bug fixes on version 3.0 master is for new stuff that would go into 4.0 but may be backported to 3.x if appropriate
Is master version 3.99, it appears to be 3.0 still and does show the build warning ? Bob On 15 April 2018 at 01:02, John Ralls <jra...@ceridwen.us> wrote: > Fellow Developers, > > As long promised (threatened?) I've just merged unstable into maint and > deleted unstable. In general you can just pull as usual and your branch > will be updated. > > If you have unpushed commits in a local unstable branch, rebase that > branch onto maint after pulling maint. > > If you have unpushed commits in a local maint branch: > If you want to port them to 3.x, > git branch saved-maint > git fetch > git reset --hard origin/maint > > Because of the directory structure changes you won't be able to > cherry-pick or merge your saved-maint commits. Your best bet is to make > patches with git format-patch and then edit the paths. > > Regards, > John Ralls > > _______________________________________________ > gnucash-devel mailing list > gnucash-devel@gnucash.org > https://lists.gnucash.org/mailman/listinfo/gnucash-devel > _______________________________________________ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
