@@ -182,10 +182,10 @@ metadata, as well as the GitHub labels such as `semver-minor` and
182182omitted from a commit, the commit will show up because it's unsure if it's a
183183duplicate or not.
184184
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:
186186
187187``` 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
189189```
190190
191191Previously released commits and version bumps do not need to be
@@ -201,13 +201,15 @@ Carefully review the list of commits:
201201 ` baking-for-lts ` tag.
202202
203203When 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.
206205
207206``` 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
209208```
210209
210+ <sup >For patch releases, make sure to add the ` semver-minor ` tag
211+ to ` exclude-label ` <sup >
212+
211213When cherry-picking commits, if there are simple conflicts you can resolve
212214them. Otherwise, add the ` backport-requested-vN.x ` label to the original PR
213215and post a comment stating that it does not land cleanly and will require a
0 commit comments