search

adknowledgeportal / data-models

AD Portal data model
MIT License
3 stars 3 forks source link

updated individual animal model ad template #88

Closed ameliakallaher closed 3 months ago

ameliakallaher commented 3 months ago

@avanlinden I wanted to push our changes to the individual model-ad template from the model-ad-templates branch - is the conflict the new neuropath template being missing from the templates.csv in the branch?

avanlinden commented 3 months ago

@ameliakallaher yeah, because we've pushed changes to the main branch since we created this branch, there are changes on main that aren't in here and that's what the merge conflict is. There's a couple ways to resolve conflicts -- one is in VScode, it'll show you which lines conflict in the file and you can pick "accept incoming" "accept original" etc. You can also do it in the Github editor, which it offers above, or via command line.

github-actions[bot] commented 3 months ago

Test Suite Report

Template Generation

The following manifest templates had at least one dependency with changes detected:

template result link
BiospecimenMetadataTemplate :white_check_mark: template link
IndividualAnimalModeladMetadataTemplate :x:

:construction: Manifest Validation - COMING SOON

github-actions[bot] commented 3 months ago

Test Suite Report

Template Generation

The following manifest templates had at least one dependency with changes detected:

template result link
BiospecimenMetadataTemplate :white_check_mark: template link
IndividualAnimalMODEL-ADMetadataTemplate :white_check_mark: template link

:construction: Manifest Validation - COMING SOON

github-actions[bot] commented 3 months ago

Test Suite Report

Template Generation

The following manifest templates had at least one dependency with changes detected:

template result link
BiospecimenMetadataTemplate :white_check_mark: template link
IndividualAnimalMODEL-ADMetadataTemplate :white_check_mark: template link

:construction: Manifest Validation - COMING SOON