Skip to content

Merge to develop to clear #870 conflict#888

Merged
johnbeve merged 9 commits into
developfrom
develop_to_master_conflicts
Jun 21, 2026
Merged

Merge to develop to clear #870 conflict#888
johnbeve merged 9 commits into
developfrom
develop_to_master_conflicts

Conversation

@shanmukhkalasamudram

Copy link
Copy Markdown
Contributor

Merge to develop to clear #870 conflict

Mark Jensen and others added 9 commits November 3, 2024 22:18
- Merged develop into master.
- Cleaned up a large number of definitions, comments, inverse definitions, domains, and ranges across ontology modules.
- Revised temporal and event modeling, including interval relations, temporal ordering, process parthood, and several event definitions.
- Refactored information entity content, including updates to Information Bearing Artifact / Entity, document-related classes, and the introduction of Media Content Entity.
- Added and revised artifact, agent, measurement, transportation, infrastructure, and sensor-related content.
- Removed, deprecated, or reorganized outdated content, including familial relations and selected legacy labels/classes.
- Improved module/merge alignment and fixed ontology syntax and build issues.
- Added and repaired SPARQL QC queries for the release pipeline, including checks for labels, definitions, annotations, IRIs, and duplicate declarations.
- Added release/build tooling, including automated release notes generation and new make targets for diffing, version stamping, and merged builds.
- Expanded contributor documentation, style guidance, IRI registry support, and repository/site configuration.
This reverts commit 5d506a5.

:wq#
@shanmukhkalasamudram

Copy link
Copy Markdown
Contributor Author

@johnbeve

@johnbeve johnbeve merged commit 6c21ee3 into develop Jun 21, 2026
@johnbeve johnbeve deleted the develop_to_master_conflicts branch June 21, 2026 12:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants