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

Use the 2018 edition filenames for modules #1699

Merged
merged 1 commit into from
Mar 28, 2019

Conversation

carols10cents
Copy link
Member

To have fewer mod.rs files open!

This actually wasn't as bad as I had feared. I still expect this PR to have many merge conflicts, and I will do my best to keep it up to date!

@sgrif
Copy link
Contributor

sgrif commented Mar 28, 2019

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 28, 2019

📌 Commit e6b5681 has been approved by sgrif

@bors
Copy link
Contributor

bors commented Mar 28, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout the-great-mod-rs-rename (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self the-great-mod-rs-rename --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
CONFLICT (rename/delete): src/background/mod.rs deleted in HEAD and renamed to src/background.rs in heads/homu-tmp. Version heads/homu-tmp of src/background.rs left in tree.
Automatic merge failed; fix conflicts and then commit the result.

To have fewer `mod.rs` files open!
@carols10cents
Copy link
Member Author

@bors r=sgrif

@bors
Copy link
Contributor

bors commented Mar 28, 2019

📌 Commit fbdf63e has been approved by sgrif

@bors
Copy link
Contributor

bors commented Mar 28, 2019

⌛ Testing commit fbdf63e with merge f41626e...

bors added a commit that referenced this pull request Mar 28, 2019
Use the 2018 edition filenames for modules

To have fewer `mod.rs` files open!

This actually wasn't as bad as I had feared. I still expect this PR to have many merge conflicts, and I will do my best to keep it up to date!
@bors
Copy link
Contributor

bors commented Mar 28, 2019

☀️ Test successful - checks-travis
Approved by: sgrif
Pushing f41626e to master...

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

Successfully merging this pull request may close these issues.

3 participants