From 7b422968b464c5a01d613acc839f1356ace35577 Mon Sep 17 00:00:00 2001 From: CodeDoctorDE Date: Fri, 26 Aug 2022 08:28:54 +0200 Subject: [PATCH] Add strategy to release ci --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d43c73be9cd6..67a9ea6b0b53 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -216,7 +216,7 @@ jobs: git fetch git checkout develop git pull origin - git merge main + git merge main --strategy-option ours git push origin develop notify: runs-on: ubuntu-22.04