From 5ef593d685bb630b3db3d1a7f4de743a68420a58 Mon Sep 17 00:00:00 2001 From: Nico Flaig Date: Mon, 29 Jul 2024 16:08:54 +0100 Subject: [PATCH] docs: fix formatting of RELEASE.md file --- RELEASE.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RELEASE.md b/RELEASE.md index ad96c918a1b5..3379b40f3720 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -183,10 +183,12 @@ For example: After modified hotfix testing period, is the original bug resolved? - 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". Pull the latest commits on both `stable` and `unstable` branches: + - `git checkout stable && git pull origin stable` - `git checkout unstable && git pull origin unstable` Merge `stable` into `unstable`, resolving conflicts: + - `git checkout unstable && git merge stable` - Resolve conflicts - Sanity check locally before pushing by using: `git diff unstable origin/unstable`