Skip to content

Commit 6120e47

Browse files
committed
Sync up DEVELOPMENT.md
1 parent 2585e54 commit 6120e47

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

DEVELOPMENT.md

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,18 +108,8 @@ Hotfix releases follow the same process as standard releases above, but the `rel
108108
- Once the stable release is out:
109109
- Merge `release-v6` back to `v6` with a **Normal Merge**
110110
- **Do not** merge `release-v6` to `main`
111-
- Copy the updated root `CHANGELOG.md` entries for the `6.X.Y` release to `main` and `dev`
112-
- `git checkout main`
113-
- `git diff [email protected]@6.X.Y -- "***CHANGELOG.md" > ./docs.patch`
114-
- `git apply ./docs.patch`
115-
- `git checkout dev`
116-
- `git apply ./docs.patch`
117-
- `rm ./docs.patch`
118-
- Copy the docs changes to `main` so they show up on the live docs site for v6
119-
- `git checkout main`
120-
- `git diff [email protected]@6.X.Y docs/ > ./docs.patch`
121-
- `git apply ./docs.patch`
122-
- `rm ./docs.patch`
111+
- Manually copy the new root `CHANGELOG.md` entry to `main` and `dev`
112+
- We don't worry about backporting individual `packages/*/CHANGELOG.md` updates to `main` for subsequent v6 releases
123113
- The _code_ changes should already be in the `dev` branch
124114
- This should have happened at the time the v6 change was made (except for changes such as deprecation warnings)
125115
- Confirm that the commits in this release are all included in `dev` already, and if not you can manually bring them over by cherry-picking the commit or re-doing the work

0 commit comments

Comments
 (0)