github/lodestar
1
1
Fork 0
mirror of https://github.com/ChainSafe/lodestar.git synced 2026-01-10 16:18:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Doc fixing stable into unstable merge conflicts (#4180)

Browse Source 
Closes https://github.com/ChainSafe/lodestar/issues/4173
This commit is contained in:
Lion - dapplion
2022-06-22 07:16:26 +02:00
committed by GitHub
parent 90a289a12f
commit af4aca8385
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASE.md
View File

@@ -81,7 +81,7 @@ For example: After 3-5 days of testing, is performance equal to or better than l
- Ensure step 2 testing is successful and there is sufficient consensus to release `v1.1.0`.
- Approving the `v1.1.0 release` PR means a team member marks the release as safe, after personally reviewing and / or testing it.
- Merge `v1.1.0 release` PR to stable **with "merge commit"** strategy to preserve all history.
- Merge stable `stable` into `unstable` **with merge commit** strategy. If that's not possible, open a PR and handle conflicts latter.
- Merge stable `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.
### 5. Tag stable release