From cc8694d26d89e3e85bc81e90f6f3cfc5fb1d03ca Mon Sep 17 00:00:00 2001
From: psf <77138753+pkmnsnfrn@users.noreply.github.com>
Date: Wed, 28 May 2025 08:22:11 -0700
Subject: [PATCH] Clarifies when to use each merge type for maintainers (#6999)

Co-authored-by: hedara90 <90hedara@gmail.com>
---
 docs/team_procedures/merge_checklist.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/team_procedures/merge_checklist.md b/docs/team_procedures/merge_checklist.md
index 107f5a0f9f..ae3ff60b19 100644
--- a/docs/team_procedures/merge_checklist.md
+++ b/docs/team_procedures/merge_checklist.md
@@ -60,7 +60,11 @@ This should be used for all PRs _except_  when merging from either:
 * `upcoming`, `master` or `pret/pokeemerald`.
 
 ## Create a merge commit
-When the branch uses a publicly available feature branch from by the community, use "Create a merge commit" to preserve history for users.
+Use the "Create a merge commit" to preserve history if:
+- The branch is a publicly available feature branch from the community
+- It's a upstream `pret` merge
+- It's a `master` to `upcoming` merge
+- It's a Release merge
 
 ## Rebase and merge
 We do not use this ever.