-
Notifications
You must be signed in to change notification settings - Fork 390
New dt tool: merge-commit #9734
Copy link
Copy link
Open
Labels
P2important to work on, but not at the top of the work list.important to work on, but not at the top of the work list.contributions welcomeActively welcoming contributions for these high-priority issues.Actively welcoming contributions for these high-priority issues.infra
Description
Metadata
Metadata
Assignees
Labels
P2important to work on, but not at the top of the work list.important to work on, but not at the top of the work list.contributions welcomeActively welcoming contributions for these high-priority issues.Actively welcoming contributions for these high-priority issues.infra
In order to make sure a cherry-picked commit is not garbage collected by Github, we perform a merge-commit following the instructions here: https://github.com/flutter/devtools/blob/master/tool/RELEASE_INSTRUCTIONS.md#5-create-the-merge-commit-in-the-flutterdevtools-repo
In some scenarios (e.g. #9722) this can lead to a diff with file changes.
It's more reliable to follow the steps here: https://github.com/dart-lang/sdk/blob/main/docs/Cherry-picks-to-a-release-channel.md#cherry-picking-a-commit-in-a-dependency
In addition, we can wrap those steps in a
dttool (e.g.merge-commit) to make it even easier.