Skip to content

Conversation

@jpmckinney
Copy link
Member

@jpmckinney jpmckinney commented Aug 10, 2021

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.

@jpmckinney jpmckinney changed the base branch from 1.1-dev to 1.2-dev August 10, 2021 20:55
@jpmckinney jpmckinney requested a review from yolile August 10, 2021 20:57
@jpmckinney
Copy link
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.

@jpmckinney
Copy link
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).

@jpmckinney jpmckinney added this to the 1.2.0 milestone Jan 11, 2023
@duncandewhurst duncandewhurst added the blocked We can't merge this yet label Oct 23, 2024
@duncandewhurst
Copy link
Contributor

Adding blocked label, as I guess we'll want to do this once all other PRs are merged

@github-project-automation github-project-automation bot moved this from In progress to Reviewer approved in OCDS 1.2 Dec 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

blocked We can't merge this yet

Projects

Status: Reviewer approved

Development

Successfully merging this pull request may close these issues.

4 participants