Skip to content

chore(docs): explain the process for merging changes to master #3566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from

Conversation

alexeagle
Copy link
Contributor

No description provided.

If the automation fails, committers can also push to a branch following this naming scheme.

When a Travis build succeeds for a branch named `presubmit-*`, Travis will re-base the PR and merge to master
automatically.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and closes the PR

@mhevery mhevery added pr_state: LGTM action: cleanup The PR is in need of cleanup, either due to needing a rebase or in response to comments from reviews labels Aug 10, 2015
@alexeagle alexeagle force-pushed the committer branch 2 times, most recently from c2511a6 to 9650848 Compare August 10, 2015 20:11
We have automated the process for merging pull requests into master. Our goal is to minimize the disruption for
Angular committers and also prevent breakages on master.

When a PR is ready to merge, a project member in [this list] should add the special label,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where is the list? how do we add people? looks like they are just stored in the app engine DB
https://github.com/mhevery/angular2-automation/blob/4606b6a4837a69a913d57eb8a6257d1199356821/helloworld.py#L15
but how do we see the list, where is the app hosted?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know enought about AppEngine to know how to share the rights of the app with the wider group. Yes it is stored in DB

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added enough of a pointer so someone can track this down when needed.

On Mon, Aug 10, 2015 at 1:34 PM Miško Hevery notifications@github.com
wrote:

In COMMITTER.md
#3566 (comment):

@@ -0,0 +1,24 @@
+# Pushing changes into the Angular 2 tree
+
+Please see Using git with Angular repositories
+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 and send a pull request.
+Someone with committer access will do the rest.
+
+## The PR: merge label and presubmit-* branches
+
+We have automated the process for merging pull requests into master. Our goal is to minimize the disruption for
+Angular committers and also prevent breakages on master.
+
+When a PR is ready to merge, a project member in [this list] should add the special label,

I don't know enought about AppEngine to know how to share the rights of
the app with the wider group. Yes it is stored in DB


Reply to this email directly or view it on GitHub
https://github.com/angular/angular/pull/3566/files#r36680834.

@tbosch tbosch added action: merge The PR is ready for merge by the caretaker and removed action: cleanup The PR is in need of cleanup, either due to needing a rebase or in response to comments from reviews labels Aug 10, 2015
@mary-poppins mary-poppins removed the action: merge The PR is ready for merge by the caretaker label Aug 10, 2015
@mary-poppins
Copy link

Merging PR #3566 on behalf of @tbosch to branch presubmit-tbosch-pr-3566.

@alexeagle alexeagle closed this in 561066f Aug 11, 2015
goderbauer pushed a commit to goderbauer/angular that referenced this pull request Aug 15, 2015
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 6, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants