From f566dae440dfcb7bfce6b933b16b6b389182e77d Mon Sep 17 00:00:00 2001 From: Jhoan Date: Fri, 26 Apr 2024 11:43:30 -0500 Subject: [PATCH] Update update-pull-request.yml Signed-off-by: Jhoan --- .github/workflows/update-pull-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-pull-request.yml b/.github/workflows/update-pull-request.yml index bb50a736e224..13bc44294b86 100644 --- a/.github/workflows/update-pull-request.yml +++ b/.github/workflows/update-pull-request.yml @@ -20,7 +20,7 @@ jobs: - name: Obtener cambios del repo oficial run: git fetch kube-dash "refs/heads/${{ github.event.pull_request.base.ref }}" - name: Actualizar rama local - run: git merge FETCH_HEAD + run: git merge FETCH_HEAD --allow-unrelated-histories - name: Empujar cambios a la rama run: git push origin HEAD