Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rationalize trait class by removing 'traits' #15

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

cpommier
Copy link
Contributor

@cpommier cpommier commented Mar 27, 2020

See #13

@marieALaporte
Copy link
Contributor

@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
Copy link
Contributor Author

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
Copy link
Contributor Author

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

@cpommier cpommier changed the base branch from fix/char_encoding#13 to master March 30, 2020 06:46
@cpommier
Copy link
Contributor Author

I am working on the conflit, give me 15 minutes

@cpommier
Copy link
Contributor Author

cpommier commented Mar 30, 2020

Ok I found the conflict with 0343826
adding Jean Luc Jannink to CO_321:0001142, CO_321:0001291

@cpommier
Copy link
Contributor Author

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
Copy link
Contributor

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

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