Release Process: Add commands for merge up

[edorian]

We list all other commands RMs are expected to run explicitly.

While the merge up is common for RMs that regularly contribute code to PHP, it's not for others.

Adding this here should help people who follow the docs not forget about it.

[iluuu1994]

LGTM (as a non-RM), though I find the blanket "always do git checkout --outs" a bit odd.

[edorian]

LGTM (as a non-RM), though I find the blanket "always do git checkout --outs" a bit odd.

In this part of the process we only touch the version strings in main/php_version.h, Zend/zend.h, configure.ac, and possibly NEWS (but that's taken care of with the merge policy).

For the 3 files containing the version numbers the changes can always be discarded. Hence the blanket statement.

[iluuu1994]

Ok. I was referring to the small risk of somebody forgetting to upmerge, which would lead to their changes being lost. I was going to suggest explicitly passing the given files from above, but given it also includes Zend/zend.h and configure.ac which can diverge between branches, not sure that would help.

[edorian]

I see. That makes sense to me. It doesn't hurt to be explicit in the command.

There never should be any other changes, but if there are for some reason it's good that things fail.

I'll update.

[NattyNarwhal]

FWIW, I had GH-18607, but this looks more concise.

[edorian]

@NattyNarwhal I wasn't aware of that. Sorry!

@iluuu1994 updated

[NattyNarwhal]

Nah, it's OK. I'm glad the instructions will be more clear regardless, since I always forget that step.

[iluuu1994]

Thank you!