Branch: refs/heads/master
Home: https://github.com/tianocore/edk2
Commit: 9b34b680500bae2880622894c5e217ed792c192b
https://github.com/tianocore/edk2/commit/9b34b680500bae2880622894c5e217ed792c192b
Author: Michael Kubacki <[email protected]>
Date: 2026-04-21 (Tue, 21 Apr 2026)
Changed paths:
M .mergify/config.yml
Log Message:
-----------
.mergify/config.yml: Use rebase for update_method
The mergify configuration file documentation [1] says:
1. `update_method` is a queue rule that is the "method to use to
update the pull request with its base branch when the check is
done in place"
2. `update_method` has the following possible values:
- `null` (default)
- `merge`
- `rebase`
3. "When `null`, defaults to `merge` except if `merge_method` is
`fast-forward` then it defaults to `rebase`.
Today, mergify makes merge commits into PR branches instead of
rebases. We would prefer rebases were done instead.
It is difficult to test mergify configuration changes because it only
applies when in the default branch (master). This change is made to
attempt to perform rebases per the documentation.
[1]: https://docs.mergify.com/configuration/file-format/
Signed-off-by: Michael Kubacki <[email protected]>
To unsubscribe from these emails, change your notification settings at
https://github.com/tianocore/edk2/settings/notifications
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
