Commit 2ca8db0
committed
perfetto: advise merge-commit strategy in canary/stable PR bodies
The canary/stable branch ruleset now allows merge commits, so the
tree-replacing merge's two-parent ancestry can be preserved on the
target branch. Update the PR body hints accordingly.1 parent 3799479 commit 2ca8db0
2 files changed
Lines changed: 6 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
95 | 95 | | |
96 | 96 | | |
97 | 97 | | |
98 | | - | |
99 | | - | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
100 | 101 | | |
101 | 102 | | |
102 | 103 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
113 | 113 | | |
114 | 114 | | |
115 | 115 | | |
116 | | - | |
117 | | - | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
118 | 119 | | |
119 | 120 | | |
120 | 121 | | |
0 commit comments