From 23d9cd36d14804fe92e8a3fa26d6ed9bd07033a4 Mon Sep 17 00:00:00 2001 From: Fredrik Burmester Date: Mon, 6 Jan 2025 10:14:17 +0100 Subject: [PATCH] chore --- scripts/automerge.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 scripts/automerge.sh diff --git a/scripts/automerge.sh b/scripts/automerge.sh old mode 100644 new mode 100755 index 2d5c277a..d66a0941 --- a/scripts/automerge.sh +++ b/scripts/automerge.sh @@ -1,11 +1,11 @@ #!/bin/bash [[ -z $(git status --porcelain) ]] && -git checkout main && +git checkout master && git pull --ff-only && git checkout develop && -git merge main && +git merge master && git push --follow-tags && -git checkout main && +git checkout master && git merge develop --ff-only && git push && git checkout develop ||