From 0cde3bd49b273e7dd1e8cef457e5d6e1e951e434 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 28 Feb 2025 15:37:58 +0200 Subject: [PATCH] Merge upstream/main into sync-with-upstream with conflicts --- .github/workflows/on-pull-request.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/on-pull-request.yaml b/.github/workflows/on-pull-request.yaml index e93da04..d824517 100644 --- a/.github/workflows/on-pull-request.yaml +++ b/.github/workflows/on-pull-request.yaml @@ -93,9 +93,7 @@ jobs: git remote -v - name: Push Branch run: | - git remote remove 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 + git push https://x-access-token:${GH_TOKEN}@github.com/${FORK_REPOSITORY_PATH}.git sync-with-${BASE_BRANCH} - name: Create PR in ${{ secrets.FORK_REPOSITORY_ORGANISATION }}/${{ secrets.FORK_REPOSITORY_NAME }} if: steps.sync_fork.outcome == 'failure'