cb2ab26296
The merge script uses `git cherry-pick` for both the API merge strategy
and the autosquash strategy. It uses cherry-pick to push commits to
different target branches (e.g. into the `10.0.x` branch).
Those commits never point to the commits that landed in the primary
Github branch though. For the autosquash strategy the pull request number
is always included, so there is a way to go back to the source. On the other
hand though, for commits cherry-picked in the API merge strategy, the
pull request number might not always be included (due to Github's
implementation of the rebase merge method).
e.g.
|
||
|---|---|---|
| .. | ||
| bazel | ||
| benchmark | ||
| browsers | ||
| commit-message | ||
| format | ||
| pr | ||
| pullapprove | ||
| release | ||
| ts-circular-dependencies | ||
| utils | ||
| BUILD.bazel | ||
| cli.ts | ||
| ng-dev | ||
| tmpl-package.json | ||