search

Planteome / CO_321-wheat-traits

Wheat trait ontology
https://cropontology.org/term/CO_321:ROOT
5 stars 2 forks source link

rationalize trait class by removing 'traits' #15

Open cpommier opened 4 years ago

cpommier commented 4 years ago

See #13

marieALaporte commented 4 years ago

@cpommier I am not sure to understand what has been done here, but it would be great if you could apply that change only to the 'Trait name' column and not the entire file content. We don't want for instance the trait classes to be renamed.

cpommier commented 4 years ago

Hi @marieALaporte the trait classes are inconsistent for now. We have both "Agronomical" and "Agronomical traits" . I have removed all *traits", hence renaming all "Agronomical traits" to "Agronomical"

cpommier commented 4 years ago

We should change the base branch to master since #14 has been merged, no ?

cpommier commented 4 years ago

I am working on the conflit, give me 15 minutes

cpommier commented 4 years ago

Ok I found the conflict with https://github.com/Planteome/ibp-wheat-traits/commit/0343826e95221ec9a39ea4e369a8a8b8e49229df adding Jean Luc Jannink to CO_321:0001142, CO_321:0001291

cpommier commented 4 years ago

Rebase not possible but merge is ok. Is this ok with you @marieALaporte ? I can redo my changes from a fresh pull from master if need be, though I think we are safe here

marieALaporte commented 4 years ago

@elizabetharnaud as discussed, could you please reply to @cpommier. Thanks