Skip to content

Commit f2a22a9

Browse files
authored
Merge 5ef593d into 30b8a23
2 parents 30b8a23 + 5ef593d commit f2a22a9

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

RELEASE.md

+2
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,12 @@ For example: After modified hotfix testing period, is the original bug resolved?
183183
- Merge `stable` into `unstable` **with merge commit** strategy. Due to branch protections in `unstable` must open a PR. If there are conflicts, those must be resolved manually. Gitflow may cause changes that conflict between stable and unstable, for example due to a hotfix that is backported. If that happens, disable branch protections in unstable, merge locally fixing conflicts, run lint + tests, push, and re-enable branch protections. See "Backporting merge conflicts from stable to unstable".
184184

185185
Pull the latest commits on both `stable` and `unstable` branches:
186+
186187
- `git checkout stable && git pull origin stable`
187188
- `git checkout unstable && git pull origin unstable`
188189

189190
Merge `stable` into `unstable`, resolving conflicts:
191+
190192
- `git checkout unstable && git merge stable`
191193
- Resolve conflicts
192194
- Sanity check locally before pushing by using: `git diff unstable origin/unstable`

0 commit comments

Comments
 (0)