search

ISO-TC211 / schemas

Official ISO/TC 211 XML Schemas (input to schemas.isotc211.org)
7 stars 8 forks source link

Add 19123 to base #18

Closed ejbleys closed 4 years ago

ejbleys commented 5 years ago

XSDs from OGC

ronaldtse commented 5 years ago

@ejbleys looks like we should merge this?

ejbleys commented 5 years ago

I’ll get back to you on this Evert Bleys 4 Tudor Place HUGHES ACT 2605 Australia +61 (0)2 62811773 +61 (0)411 483 876 ejbleys@gmail.com Skype ejbleijs@gmail.com

On 2019-11-15, at 3:59 am, Ronald Tse notifications@github.com wrote:

@ejbleys https://github.com/ejbleys looks like we should merge this?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/ISO-TC211/schemas/pull/18?email_source=notifications&email_token=AIBGJZ2RJV4ZPNW3H64GGTTQTV7XLA5CNFSM4JIC77V2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEECRGHA#issuecomment-553980700, or unsubscribe https://github.com/notifications/unsubscribe-auth/AIBGJZ3PBC4MA4YPLWDLQ3LQTV7XLANCNFSM4JIC77VQ.

ejbleys commented 5 years ago

Reject the original (#18) pull request The directory name is wrong (cit: where did that come from?) (once again - I can’t work out how to dump a file/directory from my fork) I have copied the content into new directory is …/19123/-2/gmlcov/1.0/ [Query: Can you do a pull directly from the OGC repo or do I have to copy into my fork {,as I have done}?]

I have sent a query to Knut re: namespace URLs; gml version suspect the new location is good-to-go but I’ll create a pull request once sure Once I have checked that, I’ll put in a new pull request.

Cheers e Evert Bleys 4 Tudor Place HUGHES ACT 2605 Australia +61 (0)2 62811773 +61 (0)411 483 876 ejbleys@gmail.com Skype ejbleijs@gmail.com

On 2019-11-15, at 3:59 am, Ronald Tse notifications@github.com wrote:

@ejbleys https://github.com/ejbleys looks like we should merge this?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/ISO-TC211/schemas/pull/18?email_source=notifications&email_token=AIBGJZ2RJV4ZPNW3H64GGTTQTV7XLA5CNFSM4JIC77V2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEECRGHA#issuecomment-553980700, or unsubscribe https://github.com/notifications/unsubscribe-auth/AIBGJZ3PBC4MA4YPLWDLQ3LQTV7XLANCNFSM4JIC77VQ.

ronaldtse commented 5 years ago

Reject the original (#18) pull request The directory name is wrong (cit: where did that come from?) (once again - I can’t work out how to dump a file/directory from my fork)

@ejbleys you can actually modify your own fork, and there's no need for a new Pull Request (PR).

If you change your local fork, the PR here will get updated.

ejbleys commented 5 years ago

My skills in GitHub management are quite obviously limiting - How? Evert Bleys 4 Tudor Place HUGHES ACT 2605 Australia +61 (0)2 62811773 +61 (0)411 483 876 ejbleys@gmail.com Skype ejbleijs@gmail.com

On 2019-11-15, at 2:42 pm, Ronald Tse notifications@github.com wrote:

Reject the original (#18 https://github.com/ISO-TC211/schemas/pull/18) pull request The directory name is wrong (cit: where did that come from?) (once again - I can’t work out how to dump a file/directory from my fork)

@ejbleys https://github.com/ejbleys you can actually modify your own fork, and there's no need for a new Pull Request (PR).

If you change your local fork, the PR here will get updated.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/ISO-TC211/schemas/pull/18?email_source=notifications&email_token=AIBGJZ5LWCBICV5SDLH2CF3QTYLD5A5CNFSM4JIC77V2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEEEGN2Q#issuecomment-554198762, or unsubscribe https://github.com/notifications/unsubscribe-auth/AIBGJZ4ZBIADQUZ75O2CYFTQTYLD5ANCNFSM4JIC77VQ.

ejbleys commented 5 years ago

Got it, sorry Evert Bleys 4 Tudor Place HUGHES ACT 2605 Australia +61 (0)2 62811773 +61 (0)411 483 876 ejbleys@gmail.com Skype ejbleijs@gmail.com

On 2019-11-15, at 2:42 pm, Ronald Tse notifications@github.com wrote:

Reject the original (#18 https://github.com/ISO-TC211/schemas/pull/18) pull request The directory name is wrong (cit: where did that come from?) (once again - I can’t work out how to dump a file/directory from my fork)

@ejbleys https://github.com/ejbleys you can actually modify your own fork, and there's no need for a new Pull Request (PR).

If you change your local fork, the PR here will get updated.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/ISO-TC211/schemas/pull/18?email_source=notifications&email_token=AIBGJZ5LWCBICV5SDLH2CF3QTYLD5A5CNFSM4JIC77V2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEEEGN2Q#issuecomment-554198762, or unsubscribe https://github.com/notifications/unsubscribe-auth/AIBGJZ4ZBIADQUZ75O2CYFTQTYLD5ANCNFSM4JIC77VQ.

ronaldtse commented 5 years ago

@ejbleys you got it! Sorry didn't see the message in time. Regarding resolving the conflicts, you can do the following:

git remote add tc211 https://github.com/ISO-TC211/schemas
git fetch tc211
git merge tc211/master

This will allow you to merge the current changes in your fork with the content in the main repository (the non-forked repo). During the merge operation, you may need to manually edit some files to resolve the changes made in both branches (that's why they conflict each other).

ejbleys commented 5 years ago

Hi Ronald

ISO 19123-2 is now good to go We will work out where the ISO authoritative master lives later Either way a copy should exist in ISO repository with a read-me on where the authoritative copy lies (OGC or ISO)

Cheers e Evert Bleys 4 Tudor Place HUGHES ACT 2605 Australia +61 (0)2 62811773 +61 (0)411 483 876 ejbleys@gmail.com Skype ejbleijs@gmail.com

On 2019-11-15, at 3:59 am, Ronald Tse notifications@github.com wrote:

@ejbleys https://github.com/ejbleys looks like we should merge this?

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/ISO-TC211/schemas/pull/18?email_source=notifications&email_token=AIBGJZ2RJV4ZPNW3H64GGTTQTV7XLA5CNFSM4JIC77V2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEECRGHA#issuecomment-553980700, or unsubscribe https://github.com/notifications/unsubscribe-auth/AIBGJZ3PBC4MA4YPLWDLQ3LQTV7XLANCNFSM4JIC77VQ.