Open
Conversation
yolile
approved these changes
Aug 10, 2021
… relevant information first
… relevant information first
jpmckinney
force-pushed
the
ordered-properties
branch
from
bb1a465 to
e488475
Compare
Member
Author
|
To resolve a conflict, I reverted, committed only the management command, merged with 1.2-dev, and then ran the pre-commit command. So, nothing will have changed - the merge was just easier to resolve this way without error. |
Member
Author
|
Hmm, merging this will conflict with several open PRs. I'll leave it open until they are merged. Then, I can do the same as I did before (revert, run pre-commit, commit). |
3 tasks
Contributor
|
Adding blocked label, as I guess we'll want to do this once all other PRs are merged |
github-project-automation
bot
moved this from In progress
to Reviewer approved
in OCDS 1.2
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I explain the preferred order in the comments in the sort_keywords function.
No changelog entry as re-ordering keywords is not a normative change.