Skip to content

Commit

Permalink
Merge pull request #78 from opencrvs/fix-fix
Browse files Browse the repository at this point in the history
Merge upstream/main into sync-with-upstream with conflicts
  • Loading branch information
adskyiproger authored Feb 28, 2025
2 parents aca3943 + 03884b6 commit 0b44a80
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion .github/workflows/on-pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,14 @@ 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.GH_TOKEN }}@github.com/opencrvs/poc-core-test-my.git sync-with-upstream
git remote remote origin
git remote add origin https://x-access-token:${{ secrets.GH_TOKEN }}@github.com/opencrvs/poc-core-test-my.git
git push origin sync-with-upstream
- name: Create PR in ${{ secrets.FORK_REPOSITORY_ORGANISATION }}/${{ secrets.FORK_REPOSITORY_NAME }}
if: steps.sync_fork.outcome == 'failure'
Expand Down

0 comments on commit 0b44a80

Please sign in to comment.