From 899277812fff0095195c275721367e81d64658b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Pilgaard=20Gr=C3=B8ndahl?=
 <niels.pilgaard@hotmail.com>
Date: Thu, 14 Jul 2022 19:16:05 +0200
Subject: [PATCH] Update prepare-for-release.ps1

---
 automation/prepare-for-release.ps1 | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/automation/prepare-for-release.ps1 b/automation/prepare-for-release.ps1
index 850ec5d8fc..56c3ed5110 100644
--- a/automation/prepare-for-release.ps1
+++ b/automation/prepare-for-release.ps1
@@ -42,21 +42,15 @@ function Close-FixedIssues {
 
 }
 function Merge-DevelopIntoMaster {
-    Write-Host "Merging Develop into Master, and then Master into Develop"
+    Write-Host "Please Develop into Master, and then Master into Develop"
     Write-Host "Make sure you have no unsaved changes!" -ForegroundColor Red
     Write-Host "Ctrl+C to exit"
     pause
-    git checkout master
-    git merge develop
-    git push
-    git checkout develop
-    git merge master
 }
 
 Validate-SecretsFile
 Close-FixedIssues
 Merge-DevelopIntoMaster
-github_changelog_generator --since-tag $LAST_MODPACK_VERSION
 Write-Host
 Write-Host "Upload modpack? Press CTRL-C to cancel" -ForegroundColor Green
 pause