Skip to content

Commit 2ca8db0

Browse files
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

File tree

.github/workflows/cut-canary.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,9 @@ jobs:
9595
Merging this PR pushes to \`canary\` and triggers UI Cloud
9696
Build to redeploy the canary channel. See RFC-0022.
9797
98-
**Merge strategy:** use "Create a merge commit" (not squash /
99-
rebase) so the two-parent merge commit survives.
98+
**Merge with "Create a merge commit"** so the two-parent
99+
merge commit (parent1=\`canary\`, parent2=\`main\`) survives
100+
into \`canary\`'s history.
100101
EOF
101102
)"
102103
echo "::notice::Opened PR from $BRANCH → canary."

.github/workflows/promote-stable.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,9 @@ jobs:
113113
The tag push also fans out to LUCI and Cloud Build. See
114114
RFC-0022.
115115
116-
**Merge strategy:** use "Create a merge commit" (not squash /
117-
rebase) so the two-parent merge commit survives.
116+
**Merge with "Create a merge commit"** so the two-parent
117+
merge commit (parent1=\`stable\`, parent2=\`canary\`) survives
118+
into \`stable\`'s history.
118119
EOF
119120
)"
120121
echo "::notice::Opened PR from $BRANCH → stable."

0 commit comments

Comments
 (0)