Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clarifies when to use each merge type for maintainers (#6999)

Browse Source 
Co-authored-by: hedara90 <90hedara@gmail.com>
This commit is contained in:
psf 2025-05-28 08:22:11 -07:00 committed by GitHub
parent 7a9b51b387
commit cc8694d26d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/team_procedures/merge_checklist.md
View File

@ -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.