Skip to content

models/version: Add features/featureList properties #3253

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

Merged
merged 1 commit into from
Feb 8, 2021

Conversation

Turbo87
Copy link
Member

@Turbo87 Turbo87 commented Feb 7, 2021

Each published version can have different optional features and it would be nice to see when a feature has been introduced. This PR prepares for showing this information in the versions list by adding features and featureList properties to the version model.

@locks
Copy link
Contributor

locks commented Feb 8, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Feb 8, 2021

📌 Commit 78c16aa has been approved by locks

@bors
Copy link
Contributor

bors commented Feb 8, 2021

🔒 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 features-list (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 features-list --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 (add/add): Merge conflict in tests/models/version-test.js
Auto-merging tests/models/version-test.js
Auto-merging app/models/version.js
Automatic merge failed; fix conflicts and then commit the result.

@bors
Copy link
Contributor

bors commented Feb 8, 2021

☔ The latest upstream changes (presumably #3252) made this pull request unmergeable. Please resolve the merge conflicts.

@Turbo87
Copy link
Member Author

Turbo87 commented Feb 8, 2021

@bors r=locks

@bors
Copy link
Contributor

bors commented Feb 8, 2021

📌 Commit a2592b8 has been approved by locks

@bors
Copy link
Contributor

bors commented Feb 8, 2021

⌛ Testing commit a2592b8 with merge 7e428dc...

@bors
Copy link
Contributor

bors commented Feb 8, 2021

☀️ Test successful - checks-actions
Approved by: locks
Pushing 7e428dc to master...

@bors bors merged commit 7e428dc into rust-lang:master Feb 8, 2021
@Turbo87 Turbo87 deleted the features-list branch February 8, 2021 10:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants