From 0c62d8348a2246b11adf5e9c2206300a94f73862 Mon Sep 17 00:00:00 2001
From: Aleksandr Statciuk <free.arhey@gmail.com>
Date: Tue, 3 Aug 2021 08:16:05 +0300
Subject: [PATCH] Update auto-update.yml

---
 .github/workflows/auto-update.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml
index fba565387..09293c74e 100644
--- a/.github/workflows/auto-update.yml
+++ b/.github/workflows/auto-update.yml
@@ -47,9 +47,9 @@ jobs:
         with:
           ref: bot/auto-update
       - name: Fetch Origin
-        run: git fetch origin --allow-unrelated-histories
+        run: git fetch origin
       - name: Update from master
-        run: git merge origin/master
+        run: git merge --allow-unrelated-histories origin/master
       - name: Generate Token
         uses: tibdex/github-app-token@v1
         id: generate-token