ECTO release 3-10-2020

[laurenechan]

Updates to patterns for release

[laurenechan]

@matentzn looks like we have some conflicts with the PR, not certain what they mean

[matentzn]

This happens when you are working on a branch that is outdated compared to master. These are the steps:

1. Go to your release branch (ecto-release-03102020)
2. Delete the files

src/patterns/data/default/exposure_to_chemical.ofn
src/patterns/data/default/exposure_to_environmental_condition.ofn
src/patterns/data/default/exposure_to_environmental_material.ofn
src/patterns/data/default/exposure_to_environmentalprocess.ofn
src/patterns/definitions.owl

Very important: This is only safe in this case because I know that these are files that are automatically generated (the ofn files are the OWL versions of your patterns, and definitions.owl is the merged ontology of all your ofn files). This is not generally true, especially not if there are files involved that you have actually edited, like ecto-edit.owl or any of tsv are in conflict.

After they are deleted, you need to make sure your release branch is up-to-date with master: https://stackoverflow.com/questions/3876977/update-git-branches-from-master

Lastly, you run your release again, and push it to your release branch. The conflicts will have disappeared.

In a future scenario, where important files are in conflict, contact me again and I will walk you through the proper conflict resolution process, which is very fundamental to working with git!

[laurenechan]

@matentzn are we good to merge the PR now?

[matentzn]

Dont merge yet; I will take care of it. Great work!