diff --git a/.github/workflows/sync-upstream-frontend.yml b/.github/workflows/sync-upstream-frontend.yml index d2f7ddef4..a572ef6f8 100644 --- a/.github/workflows/sync-upstream-frontend.yml +++ b/.github/workflows/sync-upstream-frontend.yml @@ -19,13 +19,12 @@ jobs: - name: Add Upstream Remote and Fetch Latest Changes run: | git remote add upstream https://github.com/bluewave-labs/checkmate.git - git fetch upstream main + git fetch upstream develop - name: Create and Checkout New Shadow Branch run: | git checkout -b ${{ env.BRANCH_NAME }} - git merge --no-ff upstream/main || true # Allow conflicts for review - + git merge --no-ff upstream/develop || true - name: Push Shadow Branch to Private Repo run: | git push origin ${{ env.BRANCH_NAME }} @@ -36,6 +35,6 @@ jobs: title: "Sync Upstream (Frontend) - ${{ env.BRANCH_NAME }}" body: "Automated upstream sync for frontend repository. Please review and merge if needed." branch: ${{ env.BRANCH_NAME }} - base: main + base: develop labels: "sync, upstream" - reviewers: "ridvankaratas, ajhollid" \ No newline at end of file + reviewers: "ridvankaratas, ajhollid"