Re: [translations] Re: 2.18 release plans (again). |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
David Kastrup <dak@xxxxxxx> writes:
> Jean-Charles Malahieude <lilyfan@xxxxxxxxx> writes:
>
>> Le 22/10/2013 20:06, David Kastrup disait :
>>
>>> b) translation branch
>>>
>>> The translation branch will stop getting merged with master. Some
>>> documentation changes from master might get cherry-picked into
>>> translation (I will do that myself), and translation will get merged
>>> into the stable branch periodically, also by myself.
>>
>> Since nothing has changed on "translation" since Monday (too many
>> other things to deal with), I just merged _locally_ "master" into
>> it. Would you mind me pushing this before setting the freeze?
>
> Yes, that's fine. It would save me the work.
Oh, that's what you meant with "merge". A fast forward. That would
have been the work of about 5 seconds it saved me. Looks like I did not
think about what "nothing has changed" meant.
Wel, at least I don't need to think about it right now. I'll take a
look at current countdowns and reviews, but I'll probably go ahead
soonish, possibly pushing trivial stuff previously.
--
David Kastrup