e8ea839df8
As part of the migration to a common strategy/method for branching and releasing across the main angular repositories, updates need to be made to the documentation. These changes reflect the updates made and is based on the following document which describes the merging label expectations: https://docs.google.com/document/d/197kVillDwx-RZtSVOBtPb4BBIAw0E9RT3q3v6DZkykU PR Close #38401
21 lines
1.0 KiB
Markdown
21 lines
1.0 KiB
Markdown
# Pushing changes into the Angular tree
|
|
|
|
Please see [Using git with Angular repositories](https://docs.google.com/document/d/1h8nijFSaa1jG_UE8v4WP7glh5qOUXnYtAtJh_gwOQHI/edit)
|
|
for details about how we maintain a linear commit history and the rules for committing.
|
|
|
|
As a contributor, see the instructions in [CONTRIBUTING.md](../CONTRIBUTING.md).
|
|
|
|
# Change approvals
|
|
|
|
Change approvals in our monorepo are managed via [PullApprove](https://docs.pullapprove.com/) and are configured via the [`.pullapprove`](../.pullapprove) file.
|
|
|
|
# Merging
|
|
|
|
Once a change has all of the required approvals, either the last approver or the PR author (if PR author has the project collaborator status)
|
|
should mark the PR with the `action: merge` label and the correct [target label](https://github.com/angular/angular/blob/master/docs/TRIAGE_AND_LABELS.md#pr-target).
|
|
This signals to the caretaker that the PR should be merged. See [merge instructions](CARETAKER.md).
|
|
|
|
# Who is the Caretaker?
|
|
|
|
See [this explanation](https://twitter.com/IgorMinar/status/799365744806854656).
|