Skip to content

Commit 5631b1a

Browse files
Update git-auto-issue-branch-creation.yml
1 parent e2ea364 commit 5631b1a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/git-auto-issue-branch-creation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
git config --global user.email "[email protected]"
5858
git commit --allow-empty -m "Empty commit to allow auto PR creation"
5959
git fetch origin
60-
git rebase --strategy-option=theirs origin/main --verbose # thanks https://joht.github.io/johtizen/build/2022/01/20/github-actions-push-into-repository.html
60+
git rebase --strategy-option=theirs origin/master --verbose # thanks https://joht.github.io/johtizen/build/2022/01/20/github-actions-push-into-repository.html
6161
git push --verbose
6262
6363
- name: Creating PR based on branch name ${{ github.ref_name }}
@@ -68,4 +68,4 @@ jobs:
6868
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
6969
-H "X-GitHub-Api-Version: 2022-11-28" \
7070
https://api.github.com/repos/KarmaComputing/create-pull-request-on-branch-creation/pulls \
71-
-d '{"title": "#${{ steps.issue.outputs.number }} ${{ env.ISSUE_BRANCH_NAME }}","body":"Pull request related issue: #${{ steps.issue.outputs.number }}. Please pull these awesome changes in!","head":"${{ steps.issue.outputs.number }}-${{ env.ISSUE_BRANCH_NAME }}","base":"main"}'
71+
-d '{"title": "#${{ steps.issue.outputs.number }} ${{ env.ISSUE_BRANCH_NAME }}","body":"Pull request related issue: #${{ steps.issue.outputs.number }}. Please pull these awesome changes in!","head":"${{ steps.issue.outputs.number }}-${{ env.ISSUE_BRANCH_NAME }}","base":"master"}'

0 commit comments

Comments
 (0)