From 43577625e950678c298b7db635d219cdf00a3117 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sat, 23 Jan 2021 23:03:18 +0200
Subject: [PATCH] Update uncivbot.yml

---
 .github/workflows/uncivbot.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/uncivbot.yml b/.github/workflows/uncivbot.yml
index 8a07780269..afeaa92222 100644
--- a/.github/workflows/uncivbot.yml
+++ b/.github/workflows/uncivbot.yml
@@ -125,11 +125,16 @@ jobs:
                   pull_number: pr.number,
                   base: translations })
               
+              try {
                 await github.pulls.merge({
                   owner: context.repo.owner,
                   repo: context.repo.repo,
                   pull_number: pr.number,
                   merge_method: "squash" })
+              } catch (err) {
+                console.log(err)
+              }
+                
             }
                         
             await createTranslationBranchIfNeeded()