Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions admin/RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -149,15 +163,15 @@ 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
git merge origin/4.x
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
Expand Down