align with main, groupings in manual - #411
Merged
Merged
Conversation
lukaspie
force-pushed
the
fairmat-groupings-in-manual
branch
from
August 29, 2025 10:18
348aab1 to
e6f7bca
Compare
lukaspie
force-pushed
the
fairmat-groupings-in-manual
branch
from
October 23, 2025 15:29
e6f7bca to
817f05f
Compare
lukaspie
force-pushed
the
fairmat-groupings-in-manual
branch
from
October 24, 2025 07:50
30e4c1d to
8598de0
Compare
lukaspie
changed the title
mkuehbach
reviewed
Oct 28, 2025
mkuehbach
reviewed
Oct 28, 2025
mkuehbach
reviewed
Oct 28, 2025
mkuehbach
reviewed
Oct 28, 2025
mkuehbach
requested changes
Oct 28, 2025
mkuehbach
left a comment
mkuehbach
left a comment
Collaborator
There was a problem hiding this comment.
I support the PR for what it is, bringing the state of the official NIAC main back to our fairmat branch so that the diffs between the NXDL2025 release and our fairmat branch are minimal.
There are a few minor glitches where also the NIAC main branch would profit from being fixed but agree that this should also not block the release, specifically not when it mostly touches on contributed definitions.
mkuehbach
approved these changes
Nov 10, 2025
mkuehbach
left a comment
mkuehbach
left a comment
Collaborator
There was a problem hiding this comment.
One inconsistence to fix and then this can be merged.
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 brings back various changes from the nexusformat
mainbranch, including the groupings in the manual from nexusformat#1428