On 2019-02-12 17:02:35, Apollon Oikonomopoulos wrote: > Immediate steps > --------------- > > In light of the above, I propose the following: > > - Dismiss all unreleased work and archive the current master and > stable-2.17 branches under attic/ (I've already pushed a ref for > attic/stable-2.17). > > - Declare 2.15 EOL > > - git push --force origin v2.16.0:master and continue development from > there. I don't expect the force-push to be an issue, and it's much > cleaner than a `git merge -s ours' or messing up our versioning. We > *will* be actually throwing away that development history — at least > for the time being.
For the record: neither me nor Apollon had rights for a force-push, and after discussion that was not much better than `git merge -s ours`; the later doesn't throw away history. So we did a merge, and now master is basically v2.16.0. Please everyone rebase and resent your pull requests. Many thanks Apollon for moving things forward! iustin
signature.asc
Description: PGP signature
