File tree Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -67,11 +67,11 @@ jobs:
67
67
run : |
68
68
pr=${{ github.event.pull_request.number }}
69
69
echo "sync_branch=sync/main-into-develop-pr-${pr}" >> $GITHUB_OUTPUT
70
- echo "title_sync =Sync main → develop (PR #${pr})" >> $GITHUB_OUTPUT
71
- echo "body_sync =Auto-opened after merging \`${{ github.event.pull_request.head.ref }}\` into \`main\`. Source PR: #${pr}." >> $GITHUB_OUTPUT
70
+ echo "sync_title =Sync main → develop (PR #${pr})" >> $GITHUB_OUTPUT
71
+ echo "sync_body =Auto-opened after merging \`${{ github.event.pull_request.head.ref }}\` into \`main\`. Source PR: #${pr}." >> $GITHUB_OUTPUT
72
72
echo "conflict_branch=conflict/main-into-develop-pr-${pr}" >> $GITHUB_OUTPUT
73
- echo "title_conflict =Sync main → develop (resolve conflicts)" >> $GITHUB_OUTPUT
74
- echo "body_conflict =Opened from a copy of \`main\` so conflicts can be resolved without pushing to a protected branch." >> $GITHUB_OUTPUT
73
+ echo "conflict_title =Sync main → develop (resolve conflicts)" >> $GITHUB_OUTPUT
74
+ echo "conflict_body =Opened from a copy of \`main\` so conflicts can be resolved without pushing to a protected branch." >> $GITHUB_OUTPUT
75
75
76
76
# Short-lived sync branch from develop and merge main into it (do NOT rebase)
77
77
# use +e to stop errors from short-circuiting the script
@@ -151,8 +151,8 @@ jobs:
151
151
gh pr create \
152
152
--base "${BASE_BRANCH}" \
153
153
--head "${{ steps.meta.outputs.conflict_branch }}" \
154
- --title "${{ steps.meta.outputs.title_conflict }}" \
155
- --body "${{ steps.meta.outputs.body_conflict }}" \
154
+ --title "${{ steps.meta.outputs.conflict_title }}" \
155
+ --body "${{ steps.meta.outputs.conflict_body }}" \
156
156
--label back-merge \
157
157
--label automation \
158
158
--label conflicts
You can’t perform that action at this time.
0 commit comments