Skip to content

Commit

Permalink
Updated readme
Browse files Browse the repository at this point in the history
  • Loading branch information
Your Name committed Feb 28, 2025
1 parent cf6958e commit 70ea7df
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/on-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,11 @@ jobs:
git add -A
echo "Commit everything"
git commit -m "Merge upstream/${BASE_BRANCH} into sync-with-${BASE_BRANCH} with conflicts"
git status
git remote -v
- name: Push Branch
run: |
git push https://x-access-token:${{ secrets.FORK_ORGANISATION_TOKEN }}@github.com/${FORK_REPOSITORY_PATH}.git sync-with-${BASE_BRANCH} ||\
git push https://x-access-token:${GH_TOKEN}@github.com/${FORK_REPOSITORY_PATH}.git sync-with-${BASE_BRANCH}
git remote -v
git push https://x-access-token:${{ secrets.FORK_ORGANISATION_TOKEN }}@github.com/${FORK_REPOSITORY_PATH}.git sync-with-${BASE_BRANCH}
- name: Create PR in ${{ env.FORK_REPOSITORY_ORGANISATION }}/${{ env.FORK_REPOSITORY_NAME }}
if: steps.sync_fork.outcome == 'failure'
Expand Down

0 comments on commit 70ea7df

Please sign in to comment.