@@ -182,10 +182,10 @@ metadata, as well as the GitHub labels such as `semver-minor` and
182
182
omitted from a commit, the commit will show up because it's unsure if it's a
183
183
duplicate or not.
184
184
185
- For a list of commits that could be landed in a patch release on v1.x:
185
+ For a list of commits that could be landed in a minor release on v1.x:
186
186
187
187
``` bash
188
- branch-diff v1.x-staging main --exclude-label=semver-major,semver-minor, dont-land-on-v1.x,backport-requested-v1.x,backport-blocked-v1.x,backport-open-v1.x,backported-to-v1.x --filter-release --format=simple
188
+ branch-diff v1.x-staging main --exclude-label=semver-major,dont-land-on-v1.x,backport-requested-v1.x,backport-blocked-v1.x,backport-open-v1.x,backported-to-v1.x --filter-release --format=simple
189
189
```
190
190
191
191
Previously released commits and version bumps do not need to be
@@ -201,13 +201,15 @@ Carefully review the list of commits:
201
201
` baking-for-lts ` tag.
202
202
203
203
When you are ready to cherry-pick commits, you can automate with the following
204
- command. (For semver-minor releases, make sure to remove the ` semver-minor ` tag
205
- from ` exclude-label ` .)
204
+ command.
206
205
207
206
``` bash
208
- branch-diff v1.x-staging main --exclude-label=semver-major,semver-minor, dont-land-on-v1.x,backport-requested-v1.x,backport-blocked-v1.x,backport-open-v1.x,backported-to-v1.x --filter-release --format=sha --reverse | xargs git cherry-pick
207
+ branch-diff v1.x-staging main --exclude-label=semver-major,dont-land-on-v1.x,backport-requested-v1.x,backport-blocked-v1.x,backport-open-v1.x,backported-to-v1.x --filter-release --format=sha --reverse | xargs git cherry-pick
209
208
```
210
209
210
+ <sup >For patch releases, make sure to add the ` semver-minor ` tag
211
+ to ` exclude-label ` <sup >
212
+
211
213
When cherry-picking commits, if there are simple conflicts you can resolve
212
214
them. Otherwise, add the ` backport-requested-vN.x ` label to the original PR
213
215
and post a comment stating that it does not land cleanly and will require a
0 commit comments