Merge develop into release/15.0.0#1459
Merged
rjyounes merged 190 commits intoMay 21, 2026
Merged
Conversation
Co-authored-by: Rebecca Younes <rebecca.younes@semanticarts.com>
This reverts commit 2797780.
…nticarts/gist into 898-handle-default-prefixes
don't bundle Contributing.md Co-authored-by: Rebecca Younes <rebecca.younes@semanticarts.com>
Fix code block formatting
Merge Release/14.0.0 into Main
Merge `issue-1327-fix-readme` into `main`
…EADME Expand README.md
Merge Release/14.1.0 into main
Conflicts in ontologies/gistCore.ttl resolved as follows: - gist:Determination: kept release/15.0.0's structural change (subClassOf Task, "activity"-based definition) and accepted develop's "sulphur" -> "sulfur" spelling fix. - gist:containedText: kept release/15.0.0's rdfs:range rdf:PlainLiteral and accepted develop's improved skos:definition. Changes are orthogonal. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
stevenchalem
requested review from
brett-heffelfinger and
rjyounes
and removed request for
brett-heffelfinger
Contributor
Author
|
Running the following confirms that merging this branch is equivalent to merging |
dylan-sa
approved these changes
May 5, 2026
dylan-sa
left a comment
dylan-sa
left a comment
Contributor
There was a problem hiding this comment.
Looks good to me. I looked specifically at the two merge conflicts with Determination and containedText -- looks like those have been properly resolved.
The other diffs I see here appear to be things changed in gist 14.1.0, which is what we'd expect to see.
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
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.
Summary
Merges
developintorelease/15.0.0to bring release-branch changes back in sync with mainline development.Two conflicts in
ontologies/gistCore.ttlwere resolved as follows:gist:DeterminationsubClassOffromEventtoTaskand reworded the definition (semantic upgrade with release note).Eventbut fixed thesulphur->sulfurmisspelling.Resolution: kept release/15.0.0's structural change and applied develop's spelling fix. Final block uses
subClassOf gist:Task, the "activity"-based definition, and "sulfur".gist:containedTextrdfs:range rdf:PlainLiteral(kept the old definition).skos:definitionto "Relates an entity containing textual information to the string constituting that textual information." (did not touch range).Resolution: the changes are orthogonal -- kept both. Final block has the new range and the new definition.
Validation
Running the following confirms that merging this branch is equivalent to merging
developand resolving the conflicts. It returns the difference between (a) mergingdevelopintorelease/15.0.0and (b) mergingstevenchalem/merge-develop-into-release-15.0.0intorelease/15.0.0. The only differences returned should be within the two conflicting ranges.