From 8a25606a3162c1bb5b6ac38bb57bfa6057e6a526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= <ae@php.net>
Date: Mon, 3 Feb 2025 12:49:32 -0300
Subject: [PATCH] Change step to a error

---
 .github/workflows/integrate.yaml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index cfdcab35a..b3737408c 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -53,18 +53,14 @@ jobs:
 
       - name: "Merge doc-base changes from master"
         run: |
-          env
+          echo === This step will fail if the merge commit is not targeting master
           cd doc-base
-          git branch
+          echo === git log -n 3
           git log -n 3
-          git checkout master
-          git branch
-          git log -n 3
-          git switch --detach -
-          git branch
-          git log -n 3
-          git -c user.email="()" -c user.name="()" merge --no-ff --no-commit master
-          git diff --cached
+          echo === git show HEAD
+          git show HEAD
+          echo === git merge --no-ff --no-commit master
+          git merge --no-ff --no-commit origin/master
 
       - name: "Run QA scripts for EN docs"
         if: "matrix.language == 'en'"