search

USGCRP / gcis-ontology

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

Deleted gcis:Article #63

Closed justgo129 closed 9 years ago

justgo129 commented 9 years ago

Deleted gcis:Article, retained gcis:AcademicArticle Related gcis:Chapter to report in-lieu of book

justgo129 commented 9 years ago

Will investigate why not working. @justgo129 and @xgmachina have signed off on potential change.

zednis commented 9 years ago

I believe you will want to sync your patch branch with the master branch. If you look at the diff you will see it would remove several recent updates to the master branch.

zednis commented 9 years ago

@justgo129 I think the following will merge master into your branch and allow you to push an updated branch that is synced off the current master.

git fetch
git checkout justgo129-patch-6
git merge master
#manually resolve any conflicts that arise
git commit gcis.ttl
git push

Note - do not do a git rebase in attempting to sync the branch with master.

zednis commented 9 years ago

@justgo129 @xgmachina This branch was forked off the subclases-of-publication branch (which has since been merged and deleted) and not master, which is why it is causing problems.

My recommendation is to close this pull request without merging and delete this branch and to create a new branch off master to re-implement these changes.

justgo129 commented 9 years ago

Should #65 be deleted as well before deleting this branch?

zednis commented 9 years ago

@justgo129 I am not sure, there have been many overlapping commits lately and I am confused about what is being changed where.

justgo129 commented 9 years ago

Understood. Closing this pull request, deleting the justgo129-patch-6 branch.