Skip to content

Commit

Permalink
Merge 5ef593d into 30b8a23
Browse files Browse the repository at this point in the history
  • Loading branch information
nflaig committed Jul 29, 2024
2 parents 30b8a23 + 5ef593d commit f2a22a9
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down

0 comments on commit f2a22a9

Please sign in to comment.