From 7931bffe5eeb4552fc0939a6a6dfedc7e15389bf Mon Sep 17 00:00:00 2001 From: Daniel Markstedt Date: Wed, 1 May 2024 16:16:46 +0900 Subject: [PATCH] Updated Release Process (markdown) --- Release-Process.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Release-Process.md b/Release-Process.md index f126352..62ff06e 100644 --- a/Release-Process.md +++ b/Release-Process.md @@ -91,8 +91,8 @@ git push origin develop ``` git checkout main git pull -# Merge in the new tag -git merge v23.04.01 +# Rebase main with the new tag +git rebase v23.04.01 # Check that there are no conflicts (there shouldn't be) git status git push origin main