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

Issue 300 #302

Closed
wants to merge 2 commits into from
Closed

Issue 300 #302

wants to merge 2 commits into from

Conversation

kaiiam
Copy link
Collaborator

@kaiiam kaiiam commented Feb 26, 2024

With @Anoosha-Sehar showing how to do a branch and merge workflow based on the ENVO protocol adding a few simple changes to the animal parts template.

@kaiiam
Copy link
Collaborator Author

kaiiam commented Feb 26, 2024

The example here changed the animal parts tsv file definitions for animal material and substance but the results in the final output don't actually change because it was the special case of pig/pork cow/beef which was already working for those lines. It is not more correct though so this could be merged. Finally the reason there is such a large diff (365 additions and deletions) after just having modified 2 lines is that we now did it with excel on a mac. Previously I had saved animal_parts.tsv with libre office. So I'm guess the line endings changed and made github freekout with the large difs. From now on we can prevent this issue by only using excel on a mac to edit the tsv files.

This PR should be safe to merge, however, it's not strictly necessary @ddooley whatever you prefer. I think we should as it did fix the issue with the diffs, and we also did change the tsv (even if the output didn't change).

@ddooley
Copy link
Collaborator

ddooley commented Mar 30, 2024

The {animal} to {animal base} has been implemented in intermediate commits, and for now the workflow is a copy from Google Sheets to the animal_parts.tsv file so we don't have to address the mac/excel issue. So I think this can be safely closed.

@ddooley ddooley closed this Mar 30, 2024
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