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 ||