Skip to content

Add note to not close ops-bot-opened forward-merger PR #761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KyleFromNVIDIA wants to merge 1 commit into
base: main
Choose a base branch
from
+1 −0
Open

Add note to not close ops-bot-opened forward-merger PR #761

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions maintainers/forward-merger.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Loading