From 7dc8ec4c43b0ac641c134188c78d41f416ebdc1e Mon Sep 17 00:00:00 2001
From: Mikhail G <furiorg@gmail.com>
Date: Mon, 15 Apr 2024 12:08:52 +0700
Subject: [PATCH] Fix: translate branch update from master (#77)
---
.github/workflows/translate_branch_update.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/workflows/translate_branch_update.yml b/.github/workflows/translate_branch_update.yml
index 8043cabae925e..754d0065afeab 100644
--- a/.github/workflows/translate_branch_update.yml
+++ b/.github/workflows/translate_branch_update.yml
@@ -25,6 +25,8 @@ jobs:
- name: Merge with their incoming
run: |
+ git checkout origin/translate
git merge origin/master --strategy-option theirs
+ git push