search

SDG-InterfaceOntology / sdgio

The repository for the Sustainable Development Goals Interface Ontology
64 stars 19 forks source link

Addition of sub-IDOs to the sub-IDO class #152

Closed Mttbnchtt closed 5 years ago

Mttbnchtt commented 5 years ago

I open this PR to carry out the task described in #151.

Mttbnchtt commented 5 years ago

@pbuttigieg and @marieALaporte: it looks like this PR has conflicts. However, I do not see any other open PR editing the same file. For now, I have only added on sub-IDO, just to get started with the PR. Should I continue or wait until we clarify the situation?

marieALaporte commented 5 years ago

It seems like the IDOs instances that you added yesterday are not in the file. Did you pull from master before branching?

Mttbnchtt commented 5 years ago

I see the IDOs from the master branch in Protege. Although both I and @pbuttigieg had to refresh or restart Protege a couple of times before seeing all of them. Not sure what this means.

marieALaporte commented 5 years ago

@Mttbnchtt yes, maybe the best will be to close this PR and start again, by pulling first the changes into master and then branching

Mttbnchtt commented 5 years ago

Indeed, I do not see the IDOs in the IDO class if I am in the issue-151 branch. I let you or @pbuttigieg close the branch to be sure that it is done correctly. Should I then re-add the first sub-IDO? (Good we spotted the issue early.)

pbuttigieg commented 5 years ago

Agreed with @marieALaporte

It looks like your OWL is behind. Try syncing the repo again and then branching. Make sure you see what you expect to in the OWL, that you're on the right branch, and have the most recent version of master.

The conflicts themselves are trivial, so it's just a question of refreshing.

image

Mttbnchtt commented 5 years ago

@pbuttigieg: sorry but I am not sure what to do exactly. I have just refreshed my GH Desktop and Protege, but, in branch issue-151 I do not see all the IDOs. I see them in the master though. I am not sure how to see OWL code and what it is that I should expect there. I am also not sure which is the "right" branch at this point. I do have the newest version of the master branch.

marieALaporte commented 5 years ago

@Mttbnchtt the simplest is to start a new branch because even if you use the git command line and merge master into your branch, you will have to resolve conflicts. This is doable is you really want to do it.

Mttbnchtt commented 5 years ago

As suggested by @marieALaporte and @pbuttigieg, I close this PR. We will use PR #153 instead.