Release Workflow: cherry picking gutenberg.php changes into trunk can cause the workflow to fail due to merge conflicts.

[vcanales]

Description

During the release of Gutenberg 18.2, @colorful-tones ran into an issue where the
"Cherry-pick the version bump commit to trunk" step failed due to a merge conflict, caused by changes to gutenberg.php that were commited to trunk after the release of 18.2 RC1, and were not incorporated into the release branch as they were not labeled.

I think there are at least a couple of options for making sure that any changes to gutenberg.php are incorporated to the release branch before cherry picking it into trunk:

1. Automatically labeling changes to gutenberg.php so that they're cherry picked into the release candidate before the stable workflow is run.
2. Modifying the workflow so that changes to the file are pulled automatically.

Step-by-step reproduction instructions

I suggest trying this in a fork:

1. Run a new release candidate workflow.
2. Modify gutenberg.php in trunk.
3. Run a stable release workflow.

The process will fail due to a merge conflict in gutenberg.php.

Screenshots, screen recording, code snippet

No response

Environment info

No response

Please confirm that you have searched existing issues in the repo.

Yes

Please confirm that you have tested with all plugins deactivated except Gutenberg.

Yes