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.

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

Contributing to hermitcore/rust repository #23

Closed
jschwe opened this issue May 18, 2020 · 2 comments
Closed

Contributing to hermitcore/rust repository #23

jschwe opened this issue May 18, 2020 · 2 comments

Comments

@jschwe
Copy link
Contributor

jschwe commented May 18, 2020

There is no issue section at hermitcore/rust so I'm opening this issue here.

Rust CONTRIBUTING.md states that

Rust follows a no merge policy, meaning, when you encounter merge conflicts you are expected to always rebase instead of merge. E.g. always use rebase when bringing the latest changes from the master branch to your feature branch. Also, please make sure that fixup commits are squashed into other related commits with meaningful commit messages.

However hermitcore/rust does contain a current merge commit. So I would suggest to drop that commit and rebase instead.

What is the current process for PRs regarding changes in stdlib? Should I open a PR against hermitcore/rust and once that's approved @stlankes opens a PR in rust-lang/rust?

@stlankes
Copy link
Contributor

The branch hermit is my personal collection and contains merge commits. I avoid to create a PR from this branch. I always create a fresh branch from rust-lang/master, test my changes, create a PR to rust-lang and delete it, if the PR is accepted.

What is the current process for PRs regarding changes in stdlib? Should I open a PR against hermitcore/rust and once that's approved @stlankes opens a PR in rust-lang/rust?

Yeah, I think that this is a good solution. Just to review it from our side.

@jschwe
Copy link
Contributor Author

jschwe commented May 19, 2020

Ah okay, I guess that works too.

@jschwe jschwe closed this as completed May 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants