From 4f4b969f71d8587df9ea0a99baef3bf8ee9ca3e6 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 29 Dec 2023 08:43:46 +0900 Subject: [PATCH] docs: add instruction to merge develop into 4.x --- admin/RELEASE.md | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/admin/RELEASE.md b/admin/RELEASE.md index 8d68ccd9923a..b168f7856354 100644 --- a/admin/RELEASE.md +++ b/admin/RELEASE.md @@ -6,7 +6,21 @@ > > -MGatner, kenjis -## [Minor version only] Merge minor version branch into develop +## Merge `develop` branch into next minor version branch `4.x` + +Before starting release process, if there are commits in `develop` branch that +are not merged into `4.x` branch, merge them. This is because if conflicts occur, +merging will take time. + +```console +git fetch upstream +git switch 4.x +git merge upstream/4.x +git merge upstream/develop +git push upstream HEAD +``` + +## [Minor version only] Merge minor version branch into `develop` If you release a new minor version. @@ -149,7 +163,7 @@ Work off direct clones of the repos so the release branches persist for a time. git merge origin/master git push origin HEAD ``` -* [ ] Update the next minor upgrade branch `4.x`: +* [ ] Update the next minor version branch `4.x`: ```console git fetch origin git checkout 4.x @@ -157,7 +171,7 @@ Work off direct clones of the repos so the release branches persist for a time. git merge origin/develop git push origin HEAD ``` -* [ ] [Minor version only] Create the next minor upgrade branch `4.x`: +* [ ] [Minor version only] Create the new next minor version branch `4.x`: ```console git fetch origin git switch develop