Commit 42f6d4e8 authored by Luke Duncalfe's avatar Luke Duncalfe Committed by Marcia Ramos

Update links to broken master workflow

https://gitlab.com/gitlab-com/www-gitlab-com/-/merge_requests/77343 has
changed the handbook section of merging during a broken master. This
change updates the developer code review docs to reflect those changes.

https://gitlab.com/gitlab-com/www-gitlab-com/-/issues/11080
parent 2d6d8702
......@@ -409,7 +409,7 @@ When ready to merge:
- **Start a new merge request pipeline with the `Run Pipeline` button in the merge
request's "Pipelines" tab, and enable "Merge When Pipeline Succeeds" (MWPS).** Note that:
- If **[master is broken](https://about.gitlab.com/handbook/engineering/workflow/#broken-master),
do not merge the merge request**. Follow these specific [handbook instructions](https://about.gitlab.com/handbook/engineering/workflow/#maintaining-throughput-during-broken-master).
For other cases, follow these [handbook instructions](https://about.gitlab.com/handbook/engineering/workflow/#merging-during-broken-master).
- If the **latest [Pipeline for Merged Results](../ci/merge_request_pipelines/pipelines_for_merged_results/#pipelines-for-merged-results)** finished less than 2 hours ago, you
might merge without starting a new pipeline as the merge request is close
enough to `master`.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment