From 380448b14dd5d5bc8c280d0c3a710b5f037c370e Mon Sep 17 00:00:00 2001 From: Youssef Amr El-Shehaby Date: Sat, 2 Dec 2023 13:43:40 +0200 Subject: [PATCH] Merge release/patch branch into master --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 90786c4..1908dc0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -21,7 +21,7 @@ jobs: git fetch git pull git checkout master - git merge --no-ff release/patch + git merge --allow-unrelated-histories --no-ff release/patch git push origin master build: strategy: