From 6450133774a589b463f67bf9e367b5aca4ac46e7 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 29 Oct 2020 17:52:54 -0700 Subject: [PATCH] Add manual merge instructions to eng/common workflow (#875) Co-authored-by: Mike Harder --- eng/common/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/common/README.md b/eng/common/README.md index 7bda6ec94..f85e3396a 100644 --- a/eng/common/README.md +++ b/eng/common/README.md @@ -23,3 +23,4 @@ The 'Sync eng/common directory' PRs will be created in the language repositories 6. Sign off on CreateSyncPRs stage of the sync pipeline using the approval gate. This stage will create the **Sync PRs** in the various language repos. A link to each of the **Sync PRs** will show up in the **Tools PR** for you to click and review. 7. Go review and approve each of your **Sync PRs**. 8. Sign Off on the VerifyAndMerge stage. This will merge any remaining open **Sync PR** and also append `auto-merge` to the **Tools PR**. + * If a **Sync PR** has any failing checks, it will need to be manually merged, even if `/check-enforcer override` has been run ([azure-sdk-tools#1147](https://github.com/Azure/azure-sdk-tools/issues/1147)).