Skip to content

649 merge generator changes into v2 2 fix the misplacement of a nullable tag and remove the out directory#650

Merged
BrapiCoordinatorSelby merged 14 commits intobrapi-V2.2from
649-merge-generator-changes-into-v2_2-fix-the-misplacement-of-a-nullable-tag-and-remove-the-out-directory
Nov 18, 2025
Merged

649 merge generator changes into v2 2 fix the misplacement of a nullable tag and remove the out directory#650
BrapiCoordinatorSelby merged 14 commits intobrapi-V2.2from
649-merge-generator-changes-into-v2_2-fix-the-misplacement-of-a-nullable-tag-and-remove-the-out-directory

Conversation

@guydavenport
Copy link
Contributor

finally able to fix the build. please review to merge to V2_2

@BrapiCoordinatorSelby
Copy link
Member

I can resolve conflicts next week

@guydavenport
Copy link
Contributor Author

no worries, I can tomorrow. they are all generated in any case.

Guy Davenport and others added 3 commits November 17, 2025 16:19
…fix-the-misplacement-of-a-nullable-tag-and-remove-the-out-directory

# Conflicts:
#	Specification/BrAPI-Core/Studies/README.md
#	Specification/Generated/BrAPI-Core.yaml
#	Specification/Generated/BrAPI-Genotyping.yaml
#	Specification/Generated/BrAPI-Germplasm.yaml
#	Specification/Generated/BrAPI-Phenotyping.yaml
#	Specification/Generated/brapi_generated.graphqls
#	Specification/Generated/brapi_generated.json
#	Specification/Generated/brapi_generated.ttl
#	Specification/Generated/brapi_openapi.json
#	Specification/Generated/brapi_openapi_comparison.md
@guydavenport
Copy link
Contributor Author

merge done :)

@BrapiCoordinatorSelby BrapiCoordinatorSelby merged commit 3c1bac4 into brapi-V2.2 Nov 18, 2025
2 checks passed
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