Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Mention no merge policy in the CONTRIBUTING guide #59234

Merged
merged 1 commit into from
Mar 31, 2019
Merged

Mention no merge policy in the CONTRIBUTING guide #59234

merged 1 commit into from
Mar 31, 2019

Conversation

stepnivlk
Copy link
Contributor

Issue: #59233

@stepnivlk
Copy link
Contributor Author

r? @oli-obk

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 16, 2019
oli-obk
oli-obk reviewed Mar 16, 2019
View reviewed changes
Copy link
Contributor

@oli-obk oli-obk left a comment

Choose a reason for hiding this comment

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

not sure who to ping on this policy, I'll drop some hints in zulip and discord

CONTRIBUTING.md Outdated
@@ -119,6 +119,10 @@ bring those changes into the source repository.

Please make pull requests against the `master` branch.

Rust follows no merge policy, meaning you are expected to always rebase instead of merge.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Rust follows no merge policy, meaning you are expected to always rebase instead of merge.
Rust follows a no merge policy, meaning, when you encounter merge
conflicts you are expected to always rebase instead of merge.

CONTRIBUTING.md Outdated
@@ -119,6 +119,10 @@ bring those changes into the source repository.

Please make pull requests against the `master` branch.

Rust follows no merge policy, meaning you are expected to always rebase instead of merge.
E.g. always use rebase when brining latests changes from master to your feature branch.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
E.g. always use rebase when brining latests changes from master to your feature branch.
E.g. always use rebase when bringing the latests changes from
the master branch to your feature branch.

Copy link
Member

Choose a reason for hiding this comment

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

In addition to @oli-obk's suggestion above:

Suggested change
E.g. always use rebase when brining latests changes from master to your feature branch.
E.g. always use rebase when brining latest changes from master to your feature branch.

CONTRIBUTING.md Outdated
@@ -119,6 +119,10 @@ bring those changes into the source repository.

Please make pull requests against the `master` branch.

Rust follows no merge policy, meaning you are expected to always rebase instead of merge.
E.g. always use rebase when brining latests changes from master to your feature branch.
Also, please make sure all the fixup commits are squished to previous related commit.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Also, please make sure all the fixup commits are squished to previous related commit.
Also, please make sure that fixup commits are squashed into other related commits with meaningful commit messages.

@stepnivlk
Copy link
Contributor Author

@oli-obk @davidtwco thx for reviews! time to find some english course.

@Centril
Copy link
Contributor

Centril commented Mar 30, 2019

@oli-obk Ping from triage... are we happy?

@oli-obk
Copy link
Contributor

oli-obk commented Mar 31, 2019

@bors r+ rollup

jup, thanks!

@bors
Copy link
Contributor

bors commented Mar 31, 2019

📌 Commit a4b67ee has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 31, 2019
Centril added a commit to Centril/rust that referenced this pull request Mar 31, 2019
@Centril
Rollup merge of rust-lang#59234 - stepnivlk:add-no_merge_policy, r=ol…
95d95e3 
…i-obk

Mention `no merge policy` in the CONTRIBUTING guide

Issue: rust-lang#59233
@Centril Centril mentioned this pull request Mar 31, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Mar 31, 2019
@Centril
Rollup merge of rust-lang#59234 - stepnivlk:add-no_merge_policy, r=ol…
5cffe3a 
…i-obk

Mention `no merge policy` in the CONTRIBUTING guide

Issue: rust-lang#59233
@Centril Centril mentioned this pull request Mar 31, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Mar 31, 2019
@Centril
Rollup merge of rust-lang#59234 - stepnivlk:add-no_merge_policy, r=ol…
df18e19 
…i-obk

Mention `no merge policy` in the CONTRIBUTING guide

Issue: rust-lang#59233
@Centril Centril mentioned this pull request Mar 31, 2019
Merged
bors added a commit that referenced this pull request Mar 31, 2019
@bors
Auto merge of #59584 - Centril:rollup, r=Centril
a89c03a 
Rollup of 4 pull requests

Successful merges:

 - #58828 (libstd: deny(elided_lifetimes_in_paths))
 - #59234 (Mention `no merge policy` in the CONTRIBUTING guide)
 - #59572 (Include bounds in generic re-ordering diagnostic)
 - #59574 (Distinguish message for external macros depending on error level)

Failed merges:

r? @ghost
@bors bors merged commit a4b67ee into rust-lang:master Mar 31, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidtwco davidtwco davidtwco left review comments

@oli-obk oli-obk oli-obk left review comments

Assignees

@oli-obk oli-obk

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@stepnivlk @rust-highfive @Centril @oli-obk @bors @davidtwco @alexcrichton