Re: Freeze is almost here

[John Wiegley]

>>>>> Eli Zaretskii <address@hidden> writes:

> We should now change master to identify itself as version 25.1.50 or maybe
> even 26.0.50. OK?

Let's go with 25.1.50 for now.

Next time we'll coordinate better to avoid the cherry-picking. The merge
commit you'll see today is because I didn't read these messages until after
doing it, but it should have had very little impact. We also have about 12
commits of replicated history, but that's the price of learning.

FWIW, I don't believe "directionality" matters to Git, until you have changes
on one branch you don't ever want to see on another. Since the freeze hadn't
happened yet, it should have been OK to unify the branches in either
direction.

John