Staging (#10)

* Add Github Workflow for Auto Merge PRs * Test Auto Merge (#1) * Test Auto Merge * Update Token * Update Token * Update Token * Update Token * Update Token * Update script * Update script * Update script --------- Co-authored-by: Ujala Singh <[email protected]> * Update script * Update script (#2) Co-authored-by: Ujala Singh <[email protected]> * Enable Auto Merge only for main branch (#4) Co-authored-by: Ujala Singh <[email protected]> * Enable Auto Merge only for main branch (#6) Co-authored-by: Ujala Singh <[email protected]> * Pull Latest Changes * Check Flow (#8) Co-authored-by: Ujala Singh <[email protected]> * Check Flow (#9) Co-authored-by: Ujala Singh <[email protected]> --------- Co-authored-by: Ujala Singh <[email protected]>
ujala-singh · Jan 15, 2024 · 0de847f · 0de847f
1 parent 3b1d4b9
commit 0de847f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
@@ -10,7 +10,7 @@ on:
 jobs:
   auto_merge:
     runs-on: ubuntu-latest
-
+    if: github.event.pull_request.base.ref == 'main'
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3

diff --git a/.github/workflows/main-branch-pr.yaml b/.github/workflows/main-branch-pr.yaml
@@ -27,7 +27,7 @@ jobs:
         run: git fetch origin main
 
       - name: Pull latest changes
-        run: git pull origin main
+        run: git pull --rebase origin main
 
       - name: Create Main Branch PR
         run: |