Commit db18422
Use rebase merge method in Mergify for linear history and DCO compliance (#2540)
## Summary
- Changes `merge_method` from `merge` to `rebase` to comply with the
repo's linear history branch protection setting
- Removes `commit_message_template` which was only relevant for squash
merges and would have caused DCO failures (hardcoded `Signed-off-by:
Mergify <noreply@mergify.com>` doesn't match the commit author)
- Rebase keeps original signed commits intact, satisfying both DCO and
linear history requirements
## Test plan
- [ ] Verify Mergify auto-queues and merges a PR as `mergify[bot]`
🤖 Generated with [Claude Code](https://claude.com/claude-code)
---------
Co-authored-by: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>1 parent 75eb3fb commit db18422
1 file changed
+13
-10
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | 8 | | |
15 | 9 | | |
16 | 10 | | |
17 | | - | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
18 | 15 | | |
19 | 16 | | |
20 | 17 | | |
| |||
23 | 20 | | |
24 | 21 | | |
25 | 22 | | |
26 | | - | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
42 | 45 | | |
43 | 46 | | |
44 | 47 | | |
| |||
0 commit comments