Skip to content

Commit ec0d5b0

Browse files
committed
adeeed rebase
1 parent d759778 commit ec0d5b0

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

.github/workflows/promote-branch.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,10 @@ jobs:
206206
git switch ${{ needs.workflow-variables.outputs.base-branch }}
207207
git checkout -b ${{ needs.workflow-variables.outputs.target-branch }} origin/${{ needs.workflow-variables.outputs.target-branch }} || git checkout -b ${{ needs.workflow-variables.outputs.target-branch }}
208208
git push --set-upstream origin ${{ needs.workflow-variables.outputs.target-branch }}
209+
- name: 'Rebase target onto current'
210+
run: |
211+
git checkout -b ${{ github.ref_name }}
212+
git rebase ${{ needs.workflow-variables.outputs.target-branch }}
209213
- name: 'Create PR: "Promote ${{ env.current-branch }} to ${{ env.target-branch }}"'
210214
if: ${{ needs.workflow-variables.outputs.pull-request-exists == 'false' }}
211215
env:

0 commit comments

Comments
 (0)