On 21 Apr 2016, at 13:20, Eric Blake <eblake@...696...> wrote: > > Speaking of the extension branches, are we planning on rebasing them > (where I should be expecting a non-fast-forward pull), or merely doing > merges from master into the extension branches (and if so, how > frequently)? Right now, they diverge a bit from the master branch, > although I don't think we have any major conflicts to worry about; but > the longer we let them diverge, the harder it may be to eventually merge > the extensions back into master. I did wonder about that. I'm going to have a go merging master up into them. If that doesn't prove useful I will rebase. -- Alex Bligh
Attachment:
signature.asc
Description: Message signed with OpenPGP using GPGMail