Add oa:Motivation individuals; modify ConservatorActivity definition

ld4l-labs / bibliotek-o

bibliotek-o: a BIBFRAME 2 Extension Ontology

Creative Commons Zero v1.0 Universal

9 stars 8 forks source link

Add oa:Motivation individuals; modify ConservatorActivity definition #36

Closed amberbilley closed 7 years ago

amberbilley commented 7 years ago

Ignore f806d34 Pull bd05afa

dazza-codes commented 7 years ago

@amberbilley

try using git rebase -i HEAD~2 and follow the instructions to remove the commit you want to drop. It might be possible to do so using the gitk utility if you prefer a visual tool.
- https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History
all the whitespace changes in this are distracting and probably not necessary, we may need some kind of tool to remove or standardize whitespace formatting for the ontology file. (Something like a vim-mode line is what I'm thinking about.)
- maybe using xmllint --format is useful here and could be part of another PR that is merged before this one to standardize the whitespace and then we can proceed with this PR.
- https://stackoverflow.com/questions/16090869/how-to-pretty-print-xml-from-the-command-line

rjyounes commented 7 years ago

It did not go through as a commit on the ld4l-labs:develop branch, only on your fork. So no need to worry about rebase.

dazza-codes commented 7 years ago

Minor process notes:

it's common for a github PR to make a link in the initial description to the issues that are fixed by the PR
it appears that this PR is "fixing" multiple issues and that's OK, although sometimes it's easier and turns out to be quicker to have a one-to-one relationship between issues and PRs.

rjyounes commented 7 years ago

@darrenleeweber We quite agree with your notes and you will find that is the process defined in the README. Members of the team are still getting used to the process and things will not be perfect from the start. Things rarely are.

The README in fact requests a 1-to-1 relationship between issues and PRs as it makes things much clearer and facilitates review of and decisions on the PRs.

amberbilley commented 7 years ago

Ok -- thanks for you feedback @darrenleeweber and @rjyounes. FYI -- I use the GitHub Desktop UI. I'm not that familiar with the command line of GitHub, so I can't run the commands that @darrenleeweber recommends.

I'll make the changes you suggest.

amberbilley commented 7 years ago

Ok - made the changes as per your request.

rjyounes commented 7 years ago

I'm closing this PR due to the numerous confusing whitespace alterations. I've created PRs #52 and #53 instead. We'll figure out the whitespace issues later.