app: more interactive new release

pwd491 · May 3, 2024 · e9a2614 · e9a2614
1 parent fe8ade6
commit e9a2614
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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()