angular-cn/docs/COMMITTER.md

# 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, just read the instructions in [CONTRIBUTING.md](../CONTRIBUTING.md) and send a pull request.
Someone with committer access will do the rest.

# Change approvals

Change approvals in our monorepo are managed via [GitHub CODEOWNERS](https://help.github.com/articles/about-codeowners/) and are configured via the `.github/CODEOWNERS` file.


# Merging

Once a change has all the approvals either the last approver or the PR author (if PR author has the project collaborator status) should mark the PR with `PR: merge` as well as `PR target: *` labels.
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).
docs: branding fixes (#14132) Angular 1.x -> AngularJS Angular 1 -> AngularJS Angular1 -> AngularJS Angular 2+ -> Angular Angular 2.0 -> Angular Angular2 -> Angular I have deliberately not touched any of the symbol names as that would cause big merge collisions with Tobias's work. All the renames are in .md, .json, and inline comments and jsdocs. PR Close #14132 2017-01-27 01:30:42 -05:00			`# Pushing changes into the Angular tree`
chore(docs): explain the process for merging changes to master Closes #3566 2015-08-10 14:45:50 -04:00
			`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.`

docs: fix wrong link in CONTRIBUTING.md (#18228) The link to the CONTRIBUTING.md file was not correct 2017-07-20 12:33:15 -04:00			`As a contributor, just read the instructions in [CONTRIBUTING.md](../CONTRIBUTING.md) and send a pull request.`
chore(docs): explain the process for merging changes to master Closes #3566 2015-08-10 14:45:50 -04:00			`Someone with committer access will do the rest.`

docs: update COMITTER.md with info about pullapprove.com 2017-01-27 21:10:00 -05:00			`# Change approvals`
chore(docs): explain the process for merging changes to master Closes #3566 2015-08-10 14:45:50 -04:00
ci: replace our pullapprove setup with GitHub CODEOWNERS (#27690) Summary of changes: - created .github/CODEOWNERS with docs and config similar to the one in .pullapprove.yml - updated docs - updated .github/angular-robot.yml to not expect pullapprove status - removed .pullapprove.yml The primary motivations behind this change are: - CODEOWNERS didn't exist when we introduced pullapprove - CODEOWNERS is a functionality tightly integrated with github which results in better DX - pullapprove v2 has been very unstable recently causing productivity loss - pullapprove v2 has been deprecated in favor of v3, which requires and migration PR Close #27690 2018-12-15 01:32:34 -05:00			Change approvals in our monorepo are managed via [GitHub CODEOWNERS](https://help.github.com/articles/about-codeowners/) and are configured via the `.github/CODEOWNERS` file.
chore(docs): explain the process for merging changes to master Closes #3566 2015-08-10 14:45:50 -04:00
chore(docs): update the merge process docs use caretaker rather than "on-duty" Closes #6058 2015-12-21 13:02:09 -05:00
docs: update COMITTER.md with info about pullapprove.com 2017-01-27 21:10:00 -05:00			`# Merging`
chore(docs): explain the process for merging changes to master Closes #3566 2015-08-10 14:45:50 -04:00
build: Add GitHub scripts for rebasing PRs (#18359) PR Close #18359 2017-07-26 15:37:14 -04:00			Once a change has all the approvals either the last approver or the PR author (if PR author has the project collaborator status) should mark the PR with `PR: merge` as well as `PR target: *` labels.
			`This signals to the caretaker that the PR should be merged. See [merge instructions](../CARETAKER.md).`
chore(docs): explain the process for merging changes to master Closes #3566 2015-08-10 14:45:50 -04:00
docs: update COMITTER.md with info about pullapprove.com 2017-01-27 21:10:00 -05:00			`# Who is the Caretaker?`
chore(docs): explain the process for merging changes to master Closes #3566 2015-08-10 14:45:50 -04:00
docs: update COMITTER.md with info about pullapprove.com 2017-01-27 21:10:00 -05:00			`See [this explanation](https://twitter.com/IgorMinar/status/799365744806854656).`