From 113138e6ae3b1e1ed1f888632c0df1efe1e9485e Mon Sep 17 00:00:00 2001 From: Tillsa Date: Fri, 8 Oct 2021 12:11:24 +0200 Subject: [PATCH] Updated Makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9de1d0a7..669273a5 100644 --- a/Makefile +++ b/Makefile @@ -54,8 +54,8 @@ new_release: @echo " Also add the changed html pages of the docu e.g.: git add -u (adds all modified files to repo)" @echo "* Commit changes e.g. 'git commit -m \"Set version to 0.4.X\"'" @echo "* Tag the commit e.g. 'git tag -a v0.4.X -m \"version v0.4.X\"'" - @echo "* Merge release into dev and master" - @echo " git checkout master" + @echo "* Merge release into dev and main" + @echo " git checkout main" @echo " git merge release_v1.0.X" @echo " git checkout dev" @echo " git merge release_v1.0.X"