Re: Merging

[David Kastrup]

Francisco Vila <address@hidden> writes:

> Hello,
> I plan to perform the following in a few hours or days.

[Wait for a moment where master has caught up to staging.  It improves
your chances to do less work]

> merge master on translation
> test make doc
> push to translation

Well, while you are at it, you can just try pushing to staging here as
well.  If staging did not advance beyond the state of master at the
original merge, this is a fast forward, and you already tested the
result and are finished.  If staging _has_ advanced in the mean time,
pushing to it will fail and you can continue with the recipe.

> merge translation on staging

Easier to wait until staging and master are identical if you don't want
to do things more than once (in case what is already in staging has to
be thrown away).

> test make doc
> push to staging
>
> If nobody opposes.

See no reason.

-- 
David Kastrup