Hi gang: The long-planned merge is about to happen. The current `master' will become `maint-1.1' (already done), the current `next' will become `master' (in five minutes), and current Flask branch (living in personal repositories so far) will become official `next' (within a week or so).
What does this mean for you as a developer? If you have some non-merged feature branches stemmed from `master', you will see them stemmed from `maint-1.1', with `master' being far, far ahead. This is normal and you should *not* rebase your old feature branches against new `master' lightly; there may be many conflicts. Hence please beware if you have had a habit of rebasing your branches against latest master periodically, from time to time. You may want to continue working against `maint-1.1' for some time to come still, until the feature is ready. And re-apply the work against new `master' very carefully. Best regards -- Tibor Simko
