File tree Expand file tree Collapse file tree 1 file changed +4
-0
lines changed Expand file tree Collapse file tree 1 file changed +4
-0
lines changed Original file line number Diff line number Diff 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 :
You can’t perform that action at this time.
0 commit comments