angular-docs-cn/dev-infra/pr
Paul Gschwendtner cdb5d07606 feat(dev-infra): expose script for determining merge branches (#37217)
The components repo and framework repository follow the same patch
branch concept. We should be able to share a script for determining
these merge branches.

Additonally the logic has been improved compared to the old merge script because
we no longer consult `git ls-remote` unless really needed. Currently,
`git ls-remote` is always consulted, even though not necessarily needed.

This can slow down the merge script and the caretaker process when a
couple of PRs are merged (personally saw around ~4 seconds per merge).

Additionally, the new logic is more strict and will ensure (in most
cases) that no wrong patch/minor branch is determined. Previously,
the script just used the lexicographically greatest patch branch.
This _could_ be wrong when a new patch branch has been created too
early, or by accident.

PR Close #37217
2020-05-21 10:35:23 -07:00
..
discover-new-conflicts feat(dev-infra): integrate merge script into ng-dev cli (#37138) 2020-05-18 11:50:08 -07:00
merge feat(dev-infra): expose script for determining merge branches (#37217) 2020-05-21 10:35:23 -07:00
rebase feat(dev-infra): create rebase-pr tool in ng-dev (#37055) 2020-05-18 16:18:32 -07:00
BUILD.bazel feat(dev-infra): create rebase-pr tool in ng-dev (#37055) 2020-05-18 16:18:32 -07:00
cli.ts feat(dev-infra): create rebase-pr tool in ng-dev (#37055) 2020-05-18 16:18:32 -07:00