From 7ebb2018eb783ada78aa6b99de33bb4e0a1f315b Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 31 Mar 2026 14:48:45 -0400 Subject: [PATCH] Add note to not close ops-bot-opened PR --- maintainers/forward-merger.md | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/forward-merger.md b/maintainers/forward-merger.md index 8d724c9a0e3..3b54a586b36 100644 --- a/maintainers/forward-merger.md +++ b/maintainers/forward-merger.md @@ -50,5 +50,6 @@ Once this is done, open a PR that targets the default development branch (`main` **IMPORTANT**: - When merging this PR, do not use the [auto-merger]({% link resources/auto-merger.md %}) (i.e. the `/merge` comment). Instead, use the `/merge nosquash` comment. This ensures that branch history is preserved and branches remain compatible. +- DO NOT close the PR that was auto-opened by the ops-bot. Otherwise, the manual forward-merge cannot be merged with `/merge nosquash` and must be admin-merged instead. Once this PR is merged, the original forward-merger PR should automatically be merged since it will contain the same commit hashes.