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

Various updates. #5

Merged
merged 4 commits into from
Jun 2, 2018
Merged

Various updates. #5

merged 4 commits into from
Jun 2, 2018

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented May 31, 2018

  1. On merge conflict, shows what is being in conflict, and added some description how to perform a git rebase.
  2. Disallow @bors try after @bors r+ (Fix Disallow calling @bors try after the PR has been r+'ed #3)
  3. Treat [DO NOT MERGE] as the same as [WIP].
  4. Break an RC cycle with weakref.

@kennytm kennytm merged commit 53e210b into rust-lang:master Jun 2, 2018
@kennytm kennytm deleted the etc-updates branch June 2, 2018 09:29
@kennytm kennytm mentioned this pull request Jun 2, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@kennytm