From e9a2614ed61e444be8410124f6e2fbd2344952a9 Mon Sep 17 00:00:00 2001 From: Sergey Degtyar Date: Fri, 3 May 2024 23:23:09 +0300 Subject: [PATCH] app: more interactive new release --- release.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/release.py b/release.py index 2b2b796..768a758 100644 --- a/release.py +++ b/release.py @@ -56,11 +56,14 @@ def merge(): os.system("git pull") time.sleep(3) print("---Делаю merge [dev -> master]---") - os.system("git merge dev -m 'Version {NEW_APP_VERSION}'") + os.system("git merge -m 'Version {NEW_APP_VERSION}' dev") time.sleep(3) print("---Пушим в мастер ветку---") os.system("git push origin master") - + time.sleep(3) + print("---Переключаемся на dev ветку---") + os.system("git push origin master") + print("---Конец публикации новой ветке!---") if choice in yes: merge()