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
[email protected]
https://lists.gnucash.org/mailman/listinfo/gnucash-devel
