Suggested in error

php · Jan 30, 2025 · 20a517a · 20a517a
1 parent 0c3aed2
commit 20a517a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -60,7 +60,7 @@ jobs:
           php doc-base/scripts/qa/section-order.php
 
       - name: "Merge with master (to care for concurrent PRs)"
-        run: "git -C doc-base merge --no-ff --no-commit master"
+        run: "git -C doc-base merge --no-ff --no-commit origin/master"
 
       - name: "Build documentation for ${{ matrix.language }}"
         run: "php doc-base/configure.php --disable-libxml-check --enable-xml-details --redirect-stderr-to-stdout --with-lang=${{ matrix.language }}"