search

ioos / vocabularies

Instructions and Guidelines for use of Controlled Vocabularies in IOOS-compliant data services
1 stars 8 forks source link

Vocabulary readme revisions #8

Closed robragsdale closed 9 years ago

duncombe commented 9 years ago

Hi @robragsdale,

I can't automatically merge this PR, and a simple edit seems non-trivial. Can you compare the two versions of README.md: i.e., the one on the repository, and the one you were editing, and see how you want to merge the two.

robragsdale commented 9 years ago

@duncombe I will take a look at the two versions this afternoon to see what I need to do for them to be merged.

robragsdale commented 9 years ago

@duncombe I was making edits to the IOOS/vocabulary README and then made edits to the vocabulary README in my repository. I was trying to merge edits I made on the README in my repo with the README in the IOOS repo. Alex forked the Master but I continued to make edits to the README in my repo, which is what I want to merge into the IOOS README. What needs to be resolved before my README can be merged back into the IOOS Master and does Alex need to merge his now?

I see where making small edits on the README in the IOOS repo and making more extensive revisions in version that I forked has created this tangled web. I'll try to make that mistake again.

duncombe commented 9 years ago

@robragsdale

I'll try to make that mistake again. Please don't! ;-)

If you are struggling with the git merge thing, get the latest version of the README from ioos/vocabulary/master and the stuff you want to merge in, which will probably be in robragsdale/vocabulary/master and put them side-by-side. Decide what from each should be kept, and send me the result, or submit it as a new pull request. All being equal, it should be able to be merged without conflict. The trick is to edit on the most recent version of the repo, and not have anything change until you try to merge it back again.

On Tue, Nov 25, 2014 at 11:08 AM, robragsdale notifications@github.com wrote:

@duncombe https://github.com/duncombe I was making edits to the IOOS/vocabulary README https://github.com/ioos/vocabularies/blob/master/README.md and then made edits to the vocabulary README in my repository https://github.com/robragsdale/vocabularies/blob/master/README.md. I was trying to merge edits I made on the README in my repo with the README in the IOOS repo. Alex forked the Master but I continued to make edits to the README in my repo, which is what I want to merge into the IOOS README. What needs to be resolved before my README can be merged back into the IOOS Master and does Alex need to merge his now?

I see where making small edits on the README in the IOOS repo and making more extensive revisions in version that I forked has created this tangled web. I'll try to make that mistake again.

— Reply to this email directly or view it on GitHub https://github.com/ioos/vocabularies/pull/8#issuecomment-64423796.

Dr. Christopher M. Duncombe Rae c deirdre.byrne@noaa.gov hristopher.duncombe.rae@noaa.gov Oceanographer / Data Scientist IOOS/NOAA, Suite 1225, 1100 Wayne Avenue, Silver Spring, MD 20910, USA Tel: +1-301-427-2450 Fax: +1-301-427-2073

robragsdale commented 9 years ago

@duncombe I compared the most recent README in my repo with the latest IOOS README. When I tried to compare on Github, I created another pull request. I noted which section should be kept from my repo and the IOOS master. Thanks for helping correct my mistake. Please let me know if there is something more that you need.

What sections to keep from robragsdale/vocabularies

Vocabularies (title; 'V' is capitalized) and underlying contents: IOOS Instructions and Guidelines for use of Controlled Vocabularies in IOOS-compliant data services Outline • Introduction • Referencing Vocabulary Terms • Vocabulary Section and Use • Vocabulary Search Testing • References Introduction and contents Observed Properties and section contents Composite properties

What to keep from ioos/vocabularies Reference Vocabulary Terms Selecting a vocabulary term and section contents Use Cases for Implementing Vocabulary Search Concepts into the IOOS Catalog (Hyperlink) References section

These sections from both README files are the same.
Vocabulary selection and use Station Platform Types Organization Descriptors and Roles IOOS Organization Societal Sectors General and SWE Definitions Keywords Higher-level categories and vocabulary mappings Units of Measure

robragsdale commented 9 years ago

@duncombe Thank you.