From 03884b63d29dc6cacacfa13155a001223c57ce48 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 28 Feb 2025 15:34:00 +0200 Subject: [PATCH] Merge upstream/main into sync-with-upstream with conflicts --- .github/workflows/on-pull-request.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/on-pull-request.yaml b/.github/workflows/on-pull-request.yaml index 2eb936f..ccde08e 100644 --- a/.github/workflows/on-pull-request.yaml +++ b/.github/workflows/on-pull-request.yaml @@ -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'