hlapp
commented
7 years ago I see you pushed some commits directly to master (please don't), and now we have yet more merge commits that don't add any useful information. Also, this PR is now going to old_master (not sure why). I'd like to take this back to 91fdef0dd3d848fe7acc8d2f09d0c7c8b86fcdfd, and walk you through from there. I'll arrange a conference call with you.
I've also changed the branch protection settings at https://github.com/phyloref/phylo2owl/settings/branches/master so that it insists that TravisCI tests pass before merging into master
Perhaps we need to go there, but I'd rather not - one learning objective should be to adhere to conventions without being externally forced to. And sometimes there are cases and situations where you need to merge with tests failing (because, for example, the fix for the failing test is on master but not on the branch, and for some reason rebasing against master is inadvisable).
Oops, sorry -- I accidently pushed directly to phyloref@master! I'll try to remember not to do that in future, but I've also changed the branch protection settings at https://github.com/phyloref/phylo2owl/settings/branches/master so that it insists that TravisCI tests pass before merging into master -- this might make it harder for me to mess this up in the future!
In any case, here's that diff again, now with the comments fixed from the last diff -- let me know if this looks good, otherwise I'll delete phylo2owl@master and we can sort this out properly!