search

USGCRP / gcis-ontology

Ontology for the Global Change Information System
4 stars 7 forks source link

isSupportedBy #146

Closed xgmachina closed 8 years ago

xgmachina commented 8 years ago

rdfs:comment "A finding is supported by or depicted in data, figures, models, model runs, software, etc.";

xgmachina commented 8 years ago

A change per discussion in #67

xgmachina commented 8 years ago

@zednis Any suggestions on how to solve the conflicts in this branch?

justgo129 commented 8 years ago

@xgmachina I advise not merging until my concerns with https://github.com/USGCRP/gcis-ontology/issues/67 are resolved. Thanks!

zednis commented 8 years ago

the branch isSupportedBy was branched off gcis-ModelRun_and_gcis-ModelRunOutput which has since been merged into master. Master has also had an update to the label of this class, but that should not cause a conflict.

The easiest solution is to close this pull request without merging, delete this branch, and try again with a new isSupportedBy-2 branch that is based on the current master branch and not an old (merged) feature branch.

zednis commented 8 years ago

@xgmachina I have attempted to resolve the merge conflicts with master. If my commit on this branch resolves the conflicts please accept/close the pull request and delete the feature branch.

xgmachina commented 8 years ago

@zednis Thanks a lot! I just merged the commit and then deleted the branch. I will check whether the corresponding content in master and then decide whether to make another branch.