Problem
When we cherry pick a pull request which has conflicts against the staging branch and resolve those conflicts, if a non-app-deployer merges the PR, the staging deploy that should be triggered fails.
Solution
Make deploy.yml callable, such that the deployers can just manually trigger a staging/production deploy of whatever's already on the respective branch. Also, update the description of cherry pick resolution PRs to provide context that they should ideally be merged by a deployer. But if not, the deploy workflow will fail and will need to be manually re-triggered (not retried).
Problem
When we cherry pick a pull request which has conflicts against the staging branch and resolve those conflicts, if a non-app-deployer merges the PR, the staging deploy that should be triggered fails.
Solution
Make
deploy.ymlcallable, such that the deployers can just manually trigger a staging/production deploy of whatever's already on the respective branch. Also, update the description of cherry pick resolution PRs to provide context that they should ideally be merged by a deployer. But if not, the deploy workflow will fail and will need to be manually re-triggered (not retried).