Bump UCO to current state of develop - #133
Merged
Merged
Conversation
This patch is solely about Git submodule logistics, and carries no semantic impact on CASE. This patch is necessary for some "downstream" submodule synchronization. The CASE `develop-2.0.0`, `unstable`, and `unstable-2.0.0` branches should share a history point where the UCO submodule state is at its post-release `develop` status. Otherwise, catch-up merges of CASE's `develop` into other CASE branches will encounter Git merge conflicts pertaining to the submodule. This is a consequence of the plan laid out in UCO Issue 493, which was somewhat expected. However, recent trial practices in guaranteeing submodules are up to date (e.g. `case-prov` PR 63 and CASE-Corpora PR 54) have brought the issue to light, given the CASE `unstable` branch is currently behind the release rather than ahead of it, and needs `develop` updated to avoid the submodule-based merge conflicts. References: * casework/CASE-Corpora#54 * casework/CASE-Implementation-PROV-O#63 * ucoProject/UCO#493 Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
plbt5
approved these changes
Apr 6, 2023
Member
Author
|
For our awareness: The similar PR to catch |
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
2 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.
This PR does not require committee processing for merging. It should pass CI and receive an approving review, though.
This is a semi-mechanical PR similar to UCO PR 533. The patch includes an explanation for the timing, as this has typically come later in past releases' development cycles.