From 5652455e1a6b2022dc263c714dd33a98b2b80b19 Mon Sep 17 00:00:00 2001 From: Youssef Amr El-Shehaby Date: Sat, 2 Dec 2023 13:41:31 +0200 Subject: [PATCH] Update merge process --- .github/workflows/publish.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 81ce56e..90786c4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -18,7 +18,8 @@ jobs: git config --global user.name "monstajoe2002" - name: Merge to master run: | - git fetch origin master + git fetch + git pull git checkout master git merge --no-ff release/patch git push origin master