oqgraph-dev team mailing list archive
-
oqgraph-dev team
-
Mailing list archive
-
Message #00232
Equivalent of git rebase or git merge, for Bazaar Maria mainline
Hi Arjen, Antony
I have a bit of time again, I thought it would be a good idea to take my
changes and apply them on the latest Maria trunk or release candidate, given I
first branched off back in about March. Regression testing may show up if the
debug build assertions are still a problem.
Is the preferred workflow here to make a new branch from Maria and merge my
Oqgraph v3 changes to the new branch, or forward merge from Maria into my
current branch?
lp:~andymc73/oqgraph/10.0-oqgraph3-varchar
--Andrew
--
http://blog.oldcomputerjunk.net
https://launchpad.net/~andymc73
https://github.com/andymc73
Twitter: @pastcompute
GPG: http://www.andrewmcdonnell.net/gpg.html
Follow ups