Skip to content

Commit

Permalink
Update sync-branches-through-pr-2.yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
atheo89 authored Nov 13, 2024
1 parent 8cc7dd8 commit 2098780
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/sync-branches-through-pr-2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,15 @@ jobs:
# Merge the source branch into the sync branch using `theirs` strategy option to resolve conflicts
git merge -X theirs origin/${{ github.event.inputs.source }} || true
# Push the sync branch to origin to ensure it exists on the remote
git push origin $SYNC_BRANCH
# Output the branch name to use it in later steps
echo "branch=$SYNC_BRANCH" >> $GITHUB_OUTPUT
- name: Create pull request
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
with:
Expand Down

0 comments on commit 2098780

Please sign in to comment.